TODO: Work on the rendering