Just needs more test inputs