Began wiring up Song methods, reformatted a bit