Added better jsonator, started logic