Added a whole shit load of features.. :)