Yes, I can break this up in a future PR. I'll be adding more specs soon...