-wip
Trying to bake in more flexibility.