Progress: Main functionalities.
Added: Some TODOs formalize what needs doing and where.
Removed: A lot of test-code.