Refactor. Started on Infusing System.