Basic reference expansion working!
Lean out property naming schemes a bit