WIP: finished code review with Jeff Phillips