Continued work on add joint event handler