Still need to remove paths, json source working