Closes #19 - implemented weakish self references on entities