added rendering, completed parsing