almost finished, not subtracting right