re-jiggered based on new structure for things