modified the code to use handleMessage()
Added header files
Clean git stuff
Fixed conflicts