Making front end and stamping match
Making test black
Merge branch 'stamp'