big restructuring; quite  a mess now