Yes, think we should be returning pointers.