a lot of reorganization, clarification, additions; committing before I get to far ahead