Finalized format of year so integration test pass-- began refactoring