Lots of skeleton code
Forgot to not loop infinitely for test runs. Small changes