changed calendar models to event models for better use with simple calendar