still buggy but closer.