Progress. Still buggy.