Changes to date
Added map functionality