moved to json to strip out silly parsing step
also fixed splitting issues