Adding in music module, and working on a few other things