more work on album class