Added album support

Slightly messy, but basic album functions are there.