Create issues for this as you go - [ ] #30 - [x] #31 - [ ] #32
Create issues for this as you go