Committing progress. Documentation and testing incomplete/in progress. Code cleanup needed as well.