Some work on rendering

Still not finished