Worked more, almost working now...