cleaning up
ferris develop branch
ferris develop branch; no docs
almost ready to test develop branch