Moved more things to virtual controller.