Assignment 2 done. Cleaned up old comments as well. Fancy, fancy, hey?