-Redone architecture - looks like I understood things a bit wrong :P
-Code cleanup