Project 2.1 finished, comments are still needed