Forgot to include VF .cpp and .h in last commit