Should add some tests for this PR