closes #16 Given that we will deprecate these classes I don't think this is needed anymore