SOMETHING needs to be done about the refs