Just adding this in as scratch, it will probably be deleted
Work in progress. Starting to handle dates