Started implementing saving & edited week table