Add support for dates

Also fix indentation / spacing.

Also add optional destination selector.