More WIP stuff
Class now