Ok, think this works now.