Continued work on Assignment 7

Added more to Assignment 7, work is still incomplete but a lot of
progress has been made.