Fix up and get it working