Added AlbumController

Changes added once again, due to problems with aspects