added event to for sam to listen for'
what i thought i pushed last night
Fixed merge issues