Production final refactor
Eagle project fix