Album

Albums finished, ready for merge