Making sure everything's committed

This is a bit of a mess but it may as well get committed then cleaned up
later rather than having stuff kicking around on a single machine