Tried to split up commits, something ended up out of order