Phase 3 of changes from feature/modules_integration

Changed to 401 error.  We will make this more advanced (different status codes) later