Started Adding JSON elements from the server

Still a mess