finished splitting up classes