Temporary re-design in prep for deferred perspective calc.