Aiming code works! For real this time!
Merged DJ into master