---updated tests. Ready to implement docs.