lots more changes. Render code starting to look better(?)