Work from week 6

Some design, some answering of dates.