Input for draft 2

This is an overview of changes that I would suggest rather something that should be merged.