Dirty launcher implementation
Refactor launcher implementation