Move handler to separate file, add an event handler (to be implemented)