removed .swp file, begin refactoring datepicker model