Starting work on Refs
Pulled in changes