Commit of base stuff, before I start being stupid