All of this new functionality needs some tests!