Add just the methods in the interfaces and then auto generate them?