    - Cleanup
    - Improve documentation
    - Testing: need more input
    - More testing
