[WIP] Codegen errors

- [x] Remove duplication of interfaces
- [x] Fix fatal errors
Does it need to be `public`?