The new architecture is mostly in place. Just need all the other parts finished to integrate together to make the application work. 
TODO:
Test the event handler code.