Experimenting with hack-spots

Not the correct way to import this Fork.