Year Implementation is beginning to work. Need more integration tests. Need to refactor