moved some functions around
move some more things around
Merge branch 'generify'
unsubmitted songs hang around for a lil' bit