possibly not the best way to pass the class up to the user context, but ok for an initial commit