Much needed update to the codebase.  Hopefully this will resolve any issue anyone has been having.