Added events functionality (basic) for user and admin - edits still required