More work, but still bugged