sigitas-stumbras

Is this good enough? The tests that are currently failing seemingly have nothing to do with the changes I've made.

All green & commits squashed. All done now?