More Fun stuff

refactored lots of things