Turn gun into proper component