Updated Draw() and asset related things

Working to implement asset related issues so that switching back and
forth between components and assets renders correctly.