trimming down the base package.
I need to understand the relationship here a little better.
Made sure I can still get context