Starts to address Johan's notes

Not yet ready for integration