Made progress on activity persistence code.