Coupon table

First version for the coupon table.
Cleanup

Cleaned up old comments.