Nice new features. getting close