Integration of rita/joes stuff and some modifications to both.