Everything except duplicate definitions is working now.