* Some work * Fix build * PR comments * symbol renames --------- Co-authored-by: Ethan Roseman <ethteck@gmail.com>