some incremental changes and add intial json parsing