Some progress but still everything broken