Renderer refactor.
Renderer refactor.
Simplified and fixed timings.
Merge pull request #15 from dpc/new_mechanics

New mechanics