@colinwalker thanks! It may be a bit too much of a fundamental rethinking, but the goal was really to make sure that it was flexible and not too complicated