Might have actually got this working...