Re-did stuff and added better error handling

Going to use Musicbrainz to get more data plus added better error
handling