Started some basic testing components and grab rudimentary data from json
Catchup
More merge work