almost done
fixed?