still broken, but have ideas...