About to fix indexing
Fix calculation of allocation and displacement
Commit before branch
Scatter working