Render refactor (with couple of fixes)

Not a big fan of leaving todo's around in the code personally, GitHub issues should be used for that kinda thing.