moved some stuff around.  added to wiki model.