WIP: General improvements, stamper needs work.