more large rewrites, tools work now