Homework 3 working.  Cleaned up some boilerplate junk and useless methods.