Classes

Stil a WIP not complete yet :)