Made much more comprehensive

Soon with more json