still needs unit-testing though :)