Methods were named incorrectly, oops!
Removed unused imports