This relates to #30, which might be easier this way
This relates to #30, which might be easier this way