Ongoing
Added command line methods