Final commit for 12-1-14, I still have a lot to do.