move everyting to one context