On second thought, I'm going to leave this as is, since I think the ownership mechanism needs work. This way its easier to remove/refactor