Doing a quick commit before doing a big clean-out in preparation for Phase
4