More WIP with Json stuff