Context save/restore system now functional