done updating docs, now rewriting tests