There are a lot of them to go through. Feel free to push any commits here if you want to have a go at it
Closes #218
Depends on: !217