To much of a hassle to split into seperate commits. Needed to push as I see my SSD degrading and are afraid of the crash.