Working on the context controller