vbm is going to kill me for all the commits