We have quite a bit of code duplication, that should be cleaned up
We have quite a bit of code duplication, that should be cleaned up