Phase 3 of changes from feature/modules_integration

401 status?