again, restructuring a project that students completely fucked up