Almost have it fixed