Changed a LOT of things
Rewrote the rendering - some things yet to fix