Added stuff
Added CLI stuff