wip 1905 - 2-22-2020 lockstep