It's broken

I broke it, now is as good a time as any to re-write it from the ground
up