migrated to magical pointer refs everywhere