fixed a past-time bug (need to block pre-step 1 checks). Full logic implemented, needs testing