Made some changes at the end of the day broken but working