checkin scale branch.
got initial shapes working
checkin before module system