Moved status-check into command loop