WIP/FIX:

Still not working. But addresses #605