[#1] WIP - added steps that need to be taken into account while working on this one