Pull Diegos code into Jesses master repo