almost done

It actually works now