Some demo work, It seems I broke something