WIP ray refactor