merge in closer-to-working shooter code