added a couple of modules
lala
added a lot of logic and more json stuff