Cleaned up calendar and hooked up to filter system