cmdtools from branch hackathon merged