Got file uploads working, not finished refactoring the REST stuff, but need to merge this for the demo at noon today