Refactor + manager 90%