This is a bad merge let me fix it...rest should be good.