#209 Almost ready for a test run