jeffmgranja

No need to merge this I just wanted to resolve conflicts to see what discrepancies were present!