Just need to fix formatting
ls looking good, still need to run test cases