Clean up controllers, work on markers
Merge work on festivals