Merging in the Guardr codebase into this one