Work on references (#442)