Render refactor (with couple of fixes)

This is great - this should mean that these classes are no longer always be compiled. :)