Starting to look at references.
Testing, fixing.