Added CLI functionality and cleaned up a few things. CLI can still be a little janky, but it works as long as you don't do anything too crazy. Still having some issues collecting the correct return codes, but it's workable at the moment.