Start of being the code up to modern standards.
Start of tests.