Assignment 2 finished, minor tweaking ahead