Initial stab at moving around contract
Not sure what happened there
Or there. but at least it works