Closer

Well finally I had some time to do a little more work on this. It's getting closer to done.