Move acid-state-specific things to Tracker, so I can expand with more "tables"