Refs #80 - Revert last commit.  Make the main class accept a data context and an optional entity context.