Could we change these to not be pointers?