Atlas basic

Let's remove this AND clause for now, and I'll add a story to handle this properly.