Issue https://github.com/OpenACalendar/OpenACalendar-Web-Core/issues/270 - More work