Split up np funcs more.