still have one funky test, working on it