Recommit because I'm unsure what changed

Going to work on this again. Maybe finish it sometime this year.