Added steps towards properly returning structs.

1. Doesn't quite work right.