Week 2 First push

Need to get the maps and calendar sorted, along with a singleton
Week 2 Clean dirs
Push