Albums in place for #39
Widget working for #39