Begin refactoring to use GLI