Json working... need to clean up a few items still