Fixed Offlline
CLI WIP