24-oct commit-mostly completed-need testing