cleaned data manager code but doesn't link at the moment