Overhaul to save system (now more centralized, less to code each time).