Refactor Complete...ish!

Finally back to where I was when I realized that I needed to completely
rewrite everything.  After weeks of recoding I've got absolutely nothing
to show anyone...but the code is a lot prettier!