awesome, thanks for clarifying. i would def be in favor of breaking it up in a future PR :-)