Refactoring the lastfm module.  There may be hope for it.