Bunches of changes

Yay got a MVP working!