Adding events, refactoring locations, test updates, in progress