Should have committed in smaller stages.. but, I just had to bash some
of this out.