WIP changes

Almost lost these in the move to Git