Trying to move away from vfuncs.cpp, updated indexes incase it needs to come back