Begun work on command line too