Maybe add a few tests for this?