Events working fine, now back to tweaking some stuff