Intermediate baseline changes for bulk tracing

Intermediate changes. Essentially creating baseline changes for adding array ray-tracing function in the near future.