Should we add this as a git submodule?