More or less works now...