Shooting

Without merge clonflicts. Yuhuuuuuu!