Added move base functionality to the zig zag demo
Fixed merge conflicts