Not doing individual commits for this, tons of changes for tons of different aspects across multiple files.
Still rough