Starts to address Johan's notes