Yay cooking the commits. Working on something else tonight