super scamp

still working on the trunk.