Steps taken towards 33.
Added popEdit method directory
Merge branch 'orodrigu'