[WIP] Preparing the refactor of bash functions to work with the new architecture...