want to push this back to my fork

This is pretty cool.