All validated. Just needs minor straightening, then I will be done.

Still need to clean up the code and remove comments.