Changed to extends HashMap
Changed to remove dependency on org.joda.time. Might change it back when
I remember why I moved away from Calendar.