tidy up Context a bit, make it own config