Better state management

Dropped the comprehensive component persistence code for now too.