Added TODOs
Decided it was more appropriate to return a 404 instead of a 400 in some cases.