Updated s.t. cli logic is seperated in a seperate class