Pulling demo project together. General, non-specific updates.