Refactoring of Render/Prompt responabilities (Work in progress.)