Add proof-of-concept mapping
Don't handle splicing explicitly
Add alternate change type names
Merge branch 'mapping'

Conflicts:
	index.js