Slight shuffling
Handles empty list results
Added test including zero
Finished it