Initial draft of extra changes.

Signed-off-by: Philip Oakley <philipoakley@iee.org>