Second pass

I think I like what just happened here. Will take another look tomorrow.