Expiry Date

Added a lot of work to get the dates from the UI into Amber properly.  Whoa.