2.1 & 2.3

Separated Cli Builder & Logic