Initial commit stage 2

Hopefully this will work now