More work on pointers

Oh the fun conversion