Lots of changes
Lots of changes. Mostly working now