Rough Final Project

More Comments/Add Unit Tests