Final commit

This is a very stable build that I am happy with. I may not change it
from here.