Initial step for #32. Although just now realized it's wrong... will need to rework