Worked on API
Wrapping up final progress with JSON API