Importing and translating to use json for metadata so more information can be added
Will now parse metadata as JSON
Cleaned up code
Added todo/fixme tags
Now attachs metadata headers to the response
Cleaned up duplicated code in the header attaching
Merge branch 'Json-Metadata'