--- trunk/OOPSE/libBASS/BASS_interface.cpp	2004/01/19 16:08:21	957
+++ trunk/OOPSE/libBASS/BASS_interface.cpp	2004/01/29 23:01:17	998
@@ -56,11 +56,6 @@ int event_handler( event* the_event ){
       incr_block( ZCONSTRAINT_BLK );
       handled = the_globals->newZconstraint( the_event );
       break;
-
-    case RIGIDBODY:
-      incr_block( RIGIDBODY_BLK );
-      handled = the_stamps->newRigidBody( the_event );
-      break;
       
     case COMPONENT:
       incr_block( COMPONENT_BLK );
@@ -132,36 +127,27 @@ int event_handler( event* the_event ){
     
     switch( the_event->event_type ){
       
-    case ATOM:
-      incr_block( ATOM_BLK );
-      handled = the_stamps->newAtom( the_event );
-      break;
-      
-    case POSITION:
-      handled = the_stamps->rigidBodyPosition( the_event );
-      break;
-      
-    case ORIENTATION:
-      handled = the_stamps->rigidBodyOrientation( the_event );
-      break;
-
     case ASSIGNMENT:
       handled = the_stamps->rigidBodyAssign( the_event );
       break;
 
+    case MEMBERS:
+      handled = the_stamps->rigidBodyMembers( the_event );
+      break;
+      
     case BLOCK_END:
       decr_block();
       handled = the_stamps->rigidBodyEnd( the_event );
       break;
-
+      
     default:
       the_event->err_msg = 
 	strdup( "Not a valid RigidBody event\n" );
       return 0;
     }
     break;
+    
 
-
   case ATOM_BLK:
     
     switch( the_event->event_type ){
@@ -198,8 +184,8 @@ int event_handler( event* the_event ){
       handled = the_stamps->bondAssign( the_event );
       break;
       
-    case MEMBER:
-      handled = the_stamps->bondMember( the_event );
+    case MEMBERS:
+      handled = the_stamps->bondMembers( the_event );
       break;
       
     case CONSTRAINT:
@@ -226,8 +212,8 @@ int event_handler( event* the_event ){
       handled = the_stamps->bendAssign( the_event );
       break;
       
-    case MEMBER:
-      handled = the_stamps->bendMember( the_event );
+    case MEMBERS:
+      handled = the_stamps->bendMembers( the_event );
       break;
       
     case CONSTRAINT:
@@ -254,8 +240,8 @@ int event_handler( event* the_event ){
       handled = the_stamps->torsionAssign( the_event );
       break;
       
-    case MEMBER:
-      handled = the_stamps->torsionMember( the_event );
+    case MEMBERS:
+      handled = the_stamps->torsionMembers( the_event );
       break;
       
     case CONSTRAINT: