Mostly changing up some ideas, fleshing out others.