Juri wip cont.

Decided to scrap some stuff and redo