added events and ember stuff