Adding in methods
Converting value of data returns from json
Fixing conflict