iPod Full albums in Smart Playlists

[sebascrub]

I bought an iPod Touch a couple of weeks ago, and, while I do love it, I've had to make some adjustments in my listening habits. Primarily, I can no longer carry all my music on me, which is very sad. Out of my 60 GB, I can only fit whatever fits on my 16GB. I think I've got a system of smart playlists that seems to rotate music fairly well, but I do have one question that I haven't been able to figure out. I like to listen to entire albums rather than just songs (though that is changing a little with the Genius feature whenever I just have time to listen to like 15 mins of music). Anyway, is there any way to ensure that, if one song from an album is selected for the playlist, the whole album is included? And, conversely, if one song from the album is excluded from the playlist, the whole album it originated from is excluded? When I do listen to all my songs on shuffle, it annoys me that albums are left with gaps as single songs are filtered out based on when they were last played.