More AppContext work.