scaffold changes

tons of changes - now it works.