Continued refactoring
Successfully responds and also 404's