Development

Attempting to merge recent changes from the root repo into my fork.