I need to make fewer of these :) Reviewed-on: #61
Closes #14, #15 Co-authored-by: Sam Therapy <sam@samtherapy.net> Reviewed-on: #17