pre-final refactor commit. Builds clean. Minor grammar and syntax fixes remaining. 5cbd28e Chris commited on Jul 16, 2021