checking in before refactoring
checking in spec.
refactor tools parser
fix reg ex!