Work in progress: Pass references by pointer instead of value