v3

[hmellor]

• [x] #41:
  • [x] #43
  • [x] #44
  • [x] #45
  • [x] #46
  • [x] #47
  • [x] #48
  • [x] #49