added ifndef's
created make_unique and went back to string ids
small fixes
removed handleEvent from Event class
pulling develop into router feature