Dev - michael's branch

some classes and stuff