Everything works!  More testing, code-quality stuff & refinement