Added one high level feature, refactored some more code.