working on fixing tests. 5/7 pass. 2/7 still failing.