Began to add methods and Unit Tests