Add/Edit in working condition, ready for week 2