More WIP. Added events