working... mostly
almost done
all good