work in progress on context and config
work in progress on context and config