Written programmatic reference handling, but not tested yet