finishing a rough up

now to actually build this...