Got this working with some real codebases!