refactor to single data blob
mostly transfer over to manager system for barista client
essentially refactor barista into new system using a generic manager interface