In progress, added new JsonOutput from Alex… some changes already. Trying to get uni tests to run.