reopening to work on the related issues listed in https://gist.github.com/scottmarlow/6367600