Initial work on command-line utility