Some more work, it's still bugged.