Commit to work machine

Potentially breaking change just to move stuff to work.