untested patch for issue #58 - will require theming if it works
debugging issue #58 - seems to work but needs (more) theming