Re-write the data, add the artist view, slight improvements