First merge

Moving modules one at a time - will update this PR as I go along
should change to yyyy-mm-dd
http://en.wikipedia.org/wiki/ISO_8601