Working on organizing classes (wip)