major copy rewrite, more design finalization