We need to write some unit tests for this!