3/4 tests passing after merging some code -- troubleshooting why nathan boo boo head's code doesn't -- hoping a diff will help
merged