Massive rename
Update code and tests for interactors
Remove question comments
Remove default_model method, update test
Clean up todo
Add todo
Simplify that which can be simplified