Initial Commit - having some issues with the event firing however