More WIP.

Trying to figure out why multiple return values are wrong.