Worked on render code a bit, not done yet