have the welcome root working
API/json not working
Merge branch 'conflict'
fixing merge conflicts that came out of the f no where