Merge

I think I messed this up a bit.  Let's see what happens.