ls, echo now work, refactoring needed