Refactored template
Added support for many events on day and refactored to new system