Intermediary commit. Date is still a work in progress.