Refresh merge, due to the merge of Baffi into NN+ I will be pushing bug corrections only.
All Enhancements will be saved for a later date.  Congrats Baffi team on making it into NN+ Base install!
Bug fix convergance.