Fixed saving, fixed event years, refactoring.  Still need to fix recording year changes