Input dispatcher remake complete