got sidetracked for a couple months, forgot where i was, just now got all tests passing