More updates to get rendering to work.