Update. Implement edit task, change architecture