Merged obj and wave modes int the pawn and controller class