Made a start with restructuring. Interaction is now inserted.