Refactored rendering to it’s own class, and made text rendering work