Oops
Towards resolving #59