Feature/tagging sub 5

hooked up json demo data