changes all over the place for testing. almost ready stand alones.