Album Impl
Conflicts resolved