Implement a similar approach to https://github.com/flayyer/flayyer-cli/pull/12
Implement a similar approach to #12