Host organisation, refactor calendar code