Added Joda time stuff and a bunch of code that is heading towards a scheduler