WIP Major refactor of rendering system