Refactor database reader.
Prepare change to swing
Basic unit test structure. First design tests.