Yeah, that might be a better approach. Maslow code is quite hairy as it currently stands, best not to add more weird bits.