WIP: Continue to refactor class hierarchy and update for the new freezing methodology.