More dev

Lots of bugs present