rjames93-dev

Merging my latest changes with the main branch.