Separate responsibilities more clearly
Flesh out boundaries