wip separate classes