nearly complete first draft - commit before lunch