Comments added, now functional tests. Almost finished, except Classroom assigment.