Cleaned up with RecordWildcards.  Also started Save/Load logic.