More "development" in documentation and testing (Small refactorization thus far).