Finished first draft of scheduling and policies
Erk, stash and git mv do not play well together