fluff
add_primitive -> def_primitive
More splitting into separate files
more work splitting an array unit out