[GH-5] more API rework; CLI app now using proper API