Finished! Added from/to validation and formatting