work:reviewed with Adam and finished markup