I know its wrong to have a large commit like this. But I can't stand having changes anymore and need ci to work