Issue 1 conversion complete, all tests running