Trying to catch events correctly
Fixing up API stuff