Added more options to cli, committing basic config