Made cli task1 a little better. But still shitty