Organized the class, added some comments, need to get unit tests going