changed over more stuff to static json