Almost done with thoroughly untested code design