Back to drawing, gotta refactor for sound