moved some stuff around, wired up the cli