Working on making events more extendable