Sorry for all the repeats

I messed up my triangle of awesomeness and don't know how to fix it offhand.  Since I'm trying to push through stuff here, I'm going to force this through.  Maybe we can clean up the commits later?