-Full Refactoring
-Added Calendar API