Combined our work

Needs some fixing