Most of the shooting mechanism done
Merge origin/master