Refactor a bit. Add Sawtooth.