Further updating how context works. Improving the api a bit.