Lots of debugging, still broken