etc
merged
Mainly making use of new siesta features
Insert at front + edit