Refactored  some stuff and did a few events