Feature - continue holding refactor

Continue the holding refactor