Commiting for testing by @Cervator. The code currently seems to be broken.