CLI stuff
CLI seems to work

More needs to be done. But it'll do for now.