Added recurring event support, needs tests