Some cleanup of the barebones branch
Post merge conflicts