(WIP): Fixing / simplifying / improving render system