moving stuff to context