before pulling herbert's changes
trying again...
working on CLI_test
added shit that wasn't added