Working API and Calendar Just needs some finishing touches