Contiued work on renderer