Augment types in existing code, with a view to adding these to templates

[anthillape]

Some naive typings to get started with, will iteratively improve to a point where we are ready to take them into templates