Added a bunch of the offline stuff