First commit from new dev environment

Hope nothing has broken