Cleaned up context objects a little
work in progress