Everything works. Cleaning up for merge.
Cleaned up and ready to merge.