First commit in new dev environment

Hope I haven't broken anything