Refactor and testing of new fragments.