In progress commit, getting closer to working version
Working Events Navigation