Restored all the previous work done on the old week view branch.