Add the old/more feature complete code