continue refactoring of Rebond framework, almost ready for testing