Tests pass! Closes #10