working early version of new render logic