Jim branch

Pushing changes to master