WIP: refactoring redundunt fragments