moved normal command handling out of App, broke fast move