Remove use of Nullable
Remove comment
Rename whole to rest
Add two more test
Halfway?