Adding some more render controls needs a refactor at points