reorganization and initial input work