Lots of refactoring.  Added Context_Converter, which greatly cleaned up the context handling and made it more powerful.