Moving code, adding an echo