Fixed and posting to JSON
merge conflicts suckkkkkkkkkk