#533 - Merge Offline Work

Fold the offline work into the master branch.