09/01/2014

General fixes and classes implemented