Yeah, I've been thinking about/planning on doing that prepending. I'm going to do a 2nd pass on this but wanted to merge some progress before it gets too bananas!