finished scheduling step infrastructure, including undos and server-side restructuring