Another redesign before I get in too deep.