Test

The implementation here has been gutted and will be rewritten...