Going to fix this, one commit at a time.