More or less finished Assignment 2, less Doxygen.