ToF v3 initial commit