Getting ready to do a big refactor on the code.  Need this for backup.
Big refactoring.  Still lots of issues to work out