Focus areas v2

Let's merge this puppy!