Bit of help refactoring
Add executable wrapper