almost there
fixed, finally