Super Hotfix - Cased for circular dependancies

This will be the last commit for this version. Will be changing the way
class definitions are defined in the next version :) Hope you enjoyed
this version !