Add TODOs, fix xml indent
Include items in returned JSON