Commits


refactoring + move wrapping logic to its own file