wip/stmd-git
