still cleaning up the base api scheduler