Finishing up event handlers, just have to test.