Addressed some code review comments, tests still failing but getting there