Added calendar parsing. Draft version