Sync live+front with new tutorial code