Updates Event Handling, Adds Router; Removes Logic from Base