!963 Dart rebuild

Looking good...nice work