updated master with working album/picture relationship