Changed context to be the ContextStack data structure