Minor additions to finish up class skeletons. Should be able to start writing tests now