WIP on student refactor