Revert "refactoring to allow for more interfaces"

This reverts commit 50c9094704a193efad633bd2d1cd757a6015c297.
refactoring to allow for more interfaces