first take on fixing rest pointers