Lots of changes, understanding how to stucture this better now

Phew! Working again after deleting my changes :)
Added a frame rate counter