WIP: Unify functionality in a single cmd line tool