Fixes #15 (?)

The compiler accepts it, but I've really got no idea what I'm doing. It needs testing and at least a bit of comprehension.