Done, though i'm not quite sure if i made myself clear, check it here and see if there's something you might want to add. https://github.com/tgalal/wazapp/issues/58