working through Drew's review comments
passes tests, changes in response to Andy's code review