done T29 with progress T35,36
Fixing conflict
a commit to pull
Fix conflict
Tasks 17,19,29,35,36 -- 17&35 not fully finished