structural almost done
structural done