patched up more naming conversion for functions got basic nn test running