Completed basic changes for block moving logic.