Second commit, worked on year formatting