Moved drawing + audio to one file