some progress, still bugged hard