Working Version - 2
Working - Updates to return JSON