no longer echo current dir
moved code into more functions added TODO