Modified solution a little, it's more confusing to read but lines of code are shorter - just to see if anything simpler came out of it. I also modified the test output quite a bit. Eventaully I would like to make this more complex.