created #69 so we can wrap this PR up. its getting large.