Commit major refactor.
Clean up documentation.
Add TODOs to feature cluster file.