Ditch the pointers (for now?)