First work on switching internal data from Html to Json