Self-Mapping changes

Add basic drawing for self-mapping...and fix Dylan's code again.