Restore click marker to functioning

begin adding framework for multiple object support