diff --git a/.gitignore b/.gitignore
index 3c4efe2..841445c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,4 +258,14 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
\ No newline at end of file
+*.pyc
+
+# vim
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+Session.vim
+.netrwhist
+*~
+tags
diff --git a/ShadowClip/GUI/Converters.cs b/ShadowClip/GUI/Converters.cs
index 0bbdbcd..7b7c57d 100644
--- a/ShadowClip/GUI/Converters.cs
+++ b/ShadowClip/GUI/Converters.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Windows;
@@ -72,6 +73,40 @@ public object[] ConvertBack(object value, Type[] targetTypes, object parameter,
         }
     }
 
+    public class ShotTime
+    {
+        public double Time { get; set; }
+        public Thickness Margin { get; set; }
+    }
+    internal class ShotTimesConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            var none = Enumerable.Empty<ShotTime>();
+            if (!(values[0] is IEnumerable<double> times)) return none;
+            if (!(values[1] is TimeSpan duration)) return none;
+            if (!(values[2] is double width)) return none;
+            if (duration.Ticks == 0) return none;
+
+            return times.Select(time =>
+            {
+                var fraction = time / duration.TotalSeconds;
+                var offset = fraction * width - 4;
+                
+                return new ShotTime
+                {
+                    Margin = new Thickness(offset, 0, 0, 0),
+                    Time = time
+                };
+            });
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
     internal class StateToBoolConverter : ParamConverter<State>
     {
         public override object Convert(State state, string parameter)
diff --git a/ShadowClip/GUI/VideoView.xaml b/ShadowClip/GUI/VideoView.xaml
index 3b7495f..1c2441a 100644
--- a/ShadowClip/GUI/VideoView.xaml
+++ b/ShadowClip/GUI/VideoView.xaml
@@ -6,12 +6,13 @@
              xmlns:cal="http://www.caliburnproject.org"
              xmlns:gui="clr-namespace:ShadowClip.GUI"
              mc:Ignorable="d"
-             d:DesignHeight="300" d:DesignWidth="300">
+             d:DesignHeight="300" d:DesignWidth="700">
     <UserControl.Resources>
         <gui:MaxLengthConverter x:Key="MaxLength" />
         <gui:PlayActionCoverter x:Key="PlayActionCoverter" />
         <gui:IntegerSecondsConverter x:Key="IntegerSecondsConverter" />
         <gui:DurationMarginConverter x:Key="DurationMarginConverter" />
+        <gui:ShotTimesConverter x:Key="ShotTimesConverter" />
         <gui:VideoZoomConverter x:Key="VideoZoomConverter" />
     </UserControl.Resources>
     <Grid cal:Message.Attach="[Event PreviewKeyDown] = [Action KeyPressed($eventArgs)]">
@@ -71,36 +72,69 @@
                                 <ComboBoxItem Tag="4">4x</ComboBoxItem>
                             </ComboBox>
                         </StackPanel>
-
                     </StackPanel>
-                    <Border Grid.Column="1" Height="40" BorderThickness="2" Background="LightGreen"
-                            cal:Message.Attach="[Event PreviewMouseUp] = [Action PreviewClicked()]">
-                        <Border.Margin>
-                            <MultiBinding Converter="{StaticResource DurationMarginConverter}">
-                                <Binding Path="StartPosition" />
-                                <Binding Path="EndPosition" />
-                                <Binding Path="Duration" />
-                                <Binding Path="ActualWidth" ElementName="VideoSlider" />
-                            </MultiBinding>
-                        </Border.Margin>
-                        <Border.Style>
-                            <Style TargetType="Border">
-                                <Style.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="BorderBrush" Value="Black" />
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Border.Style>
-                        <TextBlock Text="Preview" HorizontalAlignment="Center" VerticalAlignment="Bottom" />
-                    </Border>
-                    <Slider Grid.Row="0" Grid.Column="1" Name="VideoSlider" VerticalAlignment="Top"
-                            cal:Message.Attach="
+                    
+                    <StackPanel Grid.Column="1">
+                        <TextBlock Visibility="{Binding IsFindingShots, Converter={StaticResource BooleanToVisibilityConverter}}" Text="Searching video for shots..." HorizontalAlignment="Center"/>
+                        <ItemsControl>
+                            <ItemsControl.ItemsSource>
+                                <MultiBinding Converter="{StaticResource ShotTimesConverter}">
+                                    <Binding Path="ShotTimes" />
+                                    <Binding Path="Duration" />
+                                    <Binding Path="ActualWidth" ElementName="VideoSlider" />
+                                </MultiBinding>
+                            </ItemsControl.ItemsSource>
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <Grid ShowGridLines="True" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+
+                            <ItemsControl.ItemContainerStyle>
+                                <Style>
+                                    <Setter Property="FrameworkElement.Margin" Value="{Binding Margin}" />
+                                </Style>
+                            </ItemsControl.ItemContainerStyle>
+
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <Button Height="20" Width="8" HorizontalAlignment="Left" Cursor="Hand"
+                                            cal:Message.Attach="GoTo($dataContext)" />
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                        <Grid>
+                            <Border Height="40" BorderThickness="2" Background="LightGreen"
+                                    cal:Message.Attach="[Event PreviewMouseUp] = [Action PreviewClicked()]">
+                                <Border.Margin>
+                                    <MultiBinding Converter="{StaticResource DurationMarginConverter}">
+                                        <Binding Path="StartPosition" />
+                                        <Binding Path="EndPosition" />
+                                        <Binding Path="Duration" />
+                                        <Binding Path="ActualWidth" ElementName="VideoSlider" />
+                                    </MultiBinding>
+                                </Border.Margin>
+                                <Border.Style>
+                                    <Style TargetType="Border">
+                                        <Style.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="True">
+                                                <Setter Property="BorderBrush" Value="Black" />
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Border.Style>
+                                <TextBlock Text="Preview" HorizontalAlignment="Center" VerticalAlignment="Bottom" />
+                            </Border>
+                            <Slider Grid.Row="0" Name="VideoSlider" VerticalAlignment="Top"
+                                    cal:Message.Attach="
                             [Event PreviewMouseDown] = [Action SliderClicked()];
                             [Event PreviewMouseUp] = [Action SliderReleased()]"
-                            Maximum="{Binding Duration, Converter={StaticResource MaxLength}}"
-                            Value="{Binding CurrentPosition}" HorizontalAlignment="Stretch"
-                            IsMoveToPointEnabled="True" />
+                                    Maximum="{Binding Duration, Converter={StaticResource MaxLength}}"
+                                    Value="{Binding CurrentPosition}" HorizontalAlignment="Stretch"
+                                    IsMoveToPointEnabled="True" />
+                        </Grid>
+                    </StackPanel>
+
                     <StackPanel Grid.Row="0" Grid.Column="2" HorizontalAlignment="Center">
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                             <TextBlock Text="{Binding Position, StringFormat=mm\\:ss}" />
@@ -133,13 +167,16 @@
                                MinWidth="30" />
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                    <Button Content="Upload Clip" Name="Upload" />
-                    <Button Content="Copy Screenshot" Name="Screenshot" />
+                    <Button Content="Upload Clip" x:Name="Upload" />
+                    <Button Content="Copy Screenshot" x:Name="Screenshot" />
                 </StackPanel>
-            </StackPanel>
+                <TextBox x:Name="NonZero" Height="23" TextWrapping="Wrap" Text="{Binding IsScopeFrame}" HorizontalAlignment="Right" Width="188"/>
+                <Label Content="Is Scope Frame?" HorizontalAlignment="Left" Width="98"/>
+        <TextBox Height="71" TextWrapping="Wrap" Text="{Binding WordString}"/>
+      </StackPanel>
 
 
         </Grid>
 
     </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/ShadowClip/GUI/VideoView.xaml.cs b/ShadowClip/GUI/VideoView.xaml.cs
new file mode 100644
index 0000000..d3223ad
--- /dev/null
+++ b/ShadowClip/GUI/VideoView.xaml.cs
@@ -0,0 +1,15 @@
+namespace ShadowClip.GUI
+{
+    public partial class VideoView
+    {
+        public VideoView()
+        {
+            InitializeComponent();
+        }
+
+        private void CheckBox_Checked(object sender, System.Windows.RoutedEventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/ShadowClip/GUI/VideoViewModel.cs b/ShadowClip/GUI/VideoViewModel.cs
index 8b5658f..46454bd 100644
--- a/ShadowClip/GUI/VideoViewModel.cs
+++ b/ShadowClip/GUI/VideoViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Windows;
@@ -7,22 +8,27 @@
 using System.Windows.Threading;
 using Caliburn.Micro;
 using ShadowClip.GUI.UploadDialog;
+using ShadowClip.services;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace ShadowClip.GUI
 {
     public sealed class VideoViewModel : Screen, IHandle<FileSelected>
     {
         private readonly IDialogBuilder _dialogBuilder;
+        private readonly IShotFinder _shotFinder;
         private readonly TimeSpan _frameTime = TimeSpan.FromTicks(166667);
         private readonly ISettings _settings;
         private FileInfo _currentFile;
         private bool _playingWhileClicked;
         private VideoView _videoView;
 
-        public VideoViewModel(IEventAggregator eventAggregator, ISettings settings, IDialogBuilder dialogBuilder)
+        public VideoViewModel(IEventAggregator eventAggregator, ISettings settings, IDialogBuilder dialogBuilder, IShotFinder shotFinder)
         {
             _settings = settings;
             _dialogBuilder = dialogBuilder;
+            _shotFinder = shotFinder;
             eventAggregator.Subscribe(this);
         }
 
@@ -32,6 +38,10 @@ public VideoViewModel(IEventAggregator eventAggregator, ISettings settings, IDia
 
         public bool IsMuted { get; set; }
 
+        public IEnumerable<double> ShotTimes { get; set; }
+
+        public bool IsFindingShots { get; set; }
+
         public MediaElement VideoPlayer => _videoView.Video;
 
         public MediaState CurrentMediaState => VideoPlayer.GetMediaState();
@@ -69,6 +79,15 @@ public void Handle(FileSelected message)
             VideoPlayer.Source = new Uri(message.File.FullName);
             VideoPlayer.Play();
             SetPostion(TimeSpan.Zero);
+            ShotTimes = new double[0];
+            FindShotTimesAsync();
+        }
+
+        private async void FindShotTimesAsync()
+        {
+            IsFindingShots = true;
+            ShotTimes = await _shotFinder.GetShotTimes(VideoPlayer.Source.AbsolutePath);
+            IsFindingShots = false;
         }
 
         public void OnIsMutedChanged()
@@ -91,6 +110,11 @@ public void MarkEnd()
             EndPosition = Position;
         }
 
+        public void GoTo(ShotTime shotTime)
+        {
+            CurrentPosition = shotTime.Time;
+        }
+
         private void SetPostion(TimeSpan position)
         {
             VideoPlayer.Pause();
@@ -226,8 +250,8 @@ public void SliderReleased()
         public void Screenshot()
         {
             var screenShot = VideoPlayer.GetScreenShot(Zoom);
-
             Clipboard.SetImage(screenShot);
+
         }
 
         public void PreviewClicked()
@@ -247,4 +271,4 @@ public void PreviewClicked()
             timer.Start();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ShadowClip/Properties/app.manifest b/ShadowClip/Properties/app.manifest
new file mode 100644
index 0000000..22556f8
--- /dev/null
+++ b/ShadowClip/Properties/app.manifest
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on and is
+           is designed to work with. Uncomment the appropriate elements and Windows will 
+           automatically selected the most compatible environment. -->
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+    </application>
+  </compatibility>
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+</assembly>
\ No newline at end of file
diff --git a/ShadowClip/ShadowClip.csproj b/ShadowClip/ShadowClip.csproj
index 18a8177..ee1eb04 100644
--- a/ShadowClip/ShadowClip.csproj
+++ b/ShadowClip/ShadowClip.csproj
@@ -64,6 +64,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -79,10 +80,10 @@
     <ApplicationIcon>Shaunkleyn-Phlat-Blue-Folders-Movies.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>42A3D830F70BA5BBAD2DED9FED66A65CB5798CBD</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>F358B11517C55DBAB2CBA7E3415D1CDB855AB8B1</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>ShadowClip_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>ShadowClip_1_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -90,10 +91,17 @@
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
@@ -130,6 +138,7 @@
     <Compile Include="services\IClipCreator.cs" />
     <Compile Include="services\IEncoder.cs" />
     <Compile Include="services\IUploader.cs" />
+    <Compile Include="services\ShotFinder.cs" />
     <Compile Include="services\Uploader.cs" />
     <Page Include="GUI\FileSelectView.xaml">
       <SubType>Designer</SubType>
@@ -171,7 +180,9 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="Properties\app.manifest" />
     <None Include="scripts\after_publish.bat" />
+    <None Include="ShadowClip_1_TemporaryKey.pfx" />
     <None Include="ShadowClip_TemporaryKey.pfx" />
     <Resource Include="Shaunkleyn-Phlat-Blue-Folders-Movies.ico" />
     <EmbeddedResource Include="Properties\Resources.resx">
@@ -191,9 +202,21 @@
     <PackageReference Include="Caliburn.Micro">
       <Version>3.0.3</Version>
     </PackageReference>
+    <PackageReference Include="FFmpeg.Nightly">
+      <Version>20170404.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="OpenCvSharp3-AnyCPU">
+      <Version>3.2.0.20170324</Version>
+    </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
       <Version>1.52.1</Version>
     </PackageReference>
+    <PackageReference Include="SoundFingerprinting">
+      <Version>3.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="Tesseract">
+      <Version>3.0.2</Version>
+    </PackageReference>
     <PackageReference Include="Unity">
       <Version>4.0.1</Version>
     </PackageReference>
@@ -211,12 +234,36 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ffmpeg.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <!--<Content Include="ffmpeg.exe">-->
+    <!--<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>-->
+    <!--</Content>-->
     <Content Include="release_notes.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="x64\liblept172.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x64\libtesseract304.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\liblept172.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\libtesseract304.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\opencv_ffmpeg320.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x64\opencv_ffmpeg320_64.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x64\OpenCvSharpExtern.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="x86\OpenCvSharpExtern.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <PublishFile Include="Caliburn.Micro">
@@ -289,6 +336,66 @@
       <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
+    <PublishFile Include="NAudio">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="Ninject">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="OpenCvSharp">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="OpenCvSharp.Blob">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="OpenCvSharp.Extensions">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="OpenCvSharp.UserInterface">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
     <PublishFile Include="PropertyChanged">
       <Visible>False</Visible>
       <Group>
@@ -299,6 +406,46 @@
       <IncludeHash>True</IncludeHash>
       <FileType>Assembly</FileType>
     </PublishFile>
+    <PublishFile Include="SoundFingerprinting">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SoundFingerprinting.Audio">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SoundFingerprinting.Audio.NAudio">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
+    <PublishFile Include="SoundFingerprinting.Infrastructure">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Assembly</FileType>
+    </PublishFile>
     <PublishFile Include="System.Windows.Interactivity">
       <Visible>False</Visible>
       <Group>
diff --git a/ShadowClip/services/FfmpegEncoder.cs b/ShadowClip/services/FfmpegEncoder.cs
index 30d135d..c136070 100644
--- a/ShadowClip/services/FfmpegEncoder.cs
+++ b/ShadowClip/services/FfmpegEncoder.cs
@@ -122,4 +122,4 @@ async void EmitProgress(StreamReader stream)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ShadowClip/services/ShotFinder.cs b/ShadowClip/services/ShotFinder.cs
new file mode 100644
index 0000000..a0f2b37
--- /dev/null
+++ b/ShadowClip/services/ShotFinder.cs
@@ -0,0 +1,273 @@
+using System;
+using System.Windows.Controls;
+using System.IO;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+using OpenCvSharp;
+using OpenCvSharp.ML;
+using System.Windows.Media.Imaging;
+
+using Tesseract;
+using SoundFingerprinting.Builder;
+using SoundFingerprinting.Audio;
+using SoundFingerprinting;
+using SoundFingerprinting.Audio.NAudio;
+using SoundFingerprinting.InMemory;
+using SoundFingerprinting.DAO.Data;
+using SoundFingerprinting.Query;
+
+namespace ShadowClip.services
+{
+    public interface IShotFinder
+    {
+        Task<IEnumerable<double>> GetShotTimes(string videoFilePath);
+    }
+
+    public class ShotFinder : IShotFinder
+    {
+        private readonly IModelService _modelService;
+        private readonly IAudioService _audioService;
+        private readonly IFingerprintCommandBuilder _fingerprintCommandBuilder ;
+        private readonly IQueryCommandBuilder _queryCommandBuilder;
+
+        public ShotFinder(InMemoryModelService modelService,
+                          NAudioService audioService,
+                          FingerprintCommandBuilder fingerprintCommandBuilder,
+                          QueryCommandBuilder queryCommandBuilder)
+        {
+            _modelService = modelService;
+            _audioService = audioService;
+            _fingerprintCommandBuilder = fingerprintCommandBuilder;
+            _queryCommandBuilder = queryCommandBuilder;
+        }
+
+        public void StoreAudioFileFingerprintsInStorageForLaterRetrieval(string pathToAudioFile,
+                                                                         string title,
+                                                                         int length)
+        {
+            var track = new TrackData("1", title, "test-song", "test-album", 2017, length);
+
+            // store track metadata in the datasource
+            var trackReference = _modelService.InsertTrack(track);
+
+            // create hashed fingerprints
+            var hashedFingerprints = _fingerprintCommandBuilder
+                                     .BuildFingerprintCommand()
+                                     .From(pathToAudioFile)
+                                     .WithFingerprintConfig(
+                                     config =>
+                                     {
+                                         config.Stride = new SoundFingerprinting.Strides.IncrementalRandomStride(1, 1); //256 512
+                                     })
+                                     .UsingServices(_audioService)
+                                     .Hash()
+                                     .Result;
+
+            // store hashes in the database for later retrieval
+            _modelService.InsertHashDataForTrack(hashedFingerprints, trackReference);
+        }
+
+        public QueryResult GetBestMatchForSong(string queryAudioFile, int secondsToAnalyze, int startTime)
+        {
+            var queryResult = _queryCommandBuilder.BuildQueryCommand()
+                              .From(queryAudioFile, secondsToAnalyze, startTime)
+                              .WithFingerprintConfig(
+                              config =>
+                              {
+                                  config.Stride = new SoundFingerprinting.Strides.IncrementalRandomStride(1, 1); //256 512
+                              })
+                              .UsingServices(_modelService, _audioService)
+                              .Query()
+                              .Result;
+
+            return queryResult;
+            // return queryResult.BestMatch.Track; // successful match has been found
+        }
+
+        private QueryResult ProcessAudio(string videoFilePath)
+        {
+            //audio location
+            //This has a hard time picking out awp shots in noisy environments
+            try
+            {
+                var process = new System.Diagnostics.Process
+                {
+                    StartInfo =
+                    {
+                        RedirectStandardError = true,
+                        RedirectStandardOutput = true,
+                        UseShellExecute = false,
+                        CreateNoWindow = true,
+                        FileName = @"ffmpeg.exe",
+                        Arguments =
+                            $"-nostdin -i \"{videoFilePath}\" -vn -ar 44100 -ac 2 -ab 192k -f mp3 \"temp.mp3\""
+                    }
+                };
+
+                process.Start();
+                process.WaitForExit();
+            }
+            catch (Exception e)
+            {
+                Console.Write(e);
+            }
+
+            StoreAudioFileFingerprintsInStorageForLaterRetrieval("C:/Users/Chris/Downloads/awp_sounds/awp/awp_01.wav", "awp_01", 4);
+            StoreAudioFileFingerprintsInStorageForLaterRetrieval("C:/Users/Chris/Downloads/awp_sounds/awp/awp_02.wav", "awp_02", 4);
+            StoreAudioFileFingerprintsInStorageForLaterRetrieval("C:/Users/Chris/Downloads/awp_sounds/awp/awp1.wav", "awp1", 4);
+            StoreAudioFileFingerprintsInStorageForLaterRetrieval("C:/Users/Chris/Downloads/awp_sounds/awp/zoom.wav", "zoom", 1);
+            StoreAudioFileFingerprintsInStorageForLaterRetrieval("C:/Users/Chris/Downloads/awp_sounds/awp/zoom.wav", "awp_boltback", 1);
+            StoreAudioFileFingerprintsInStorageForLaterRetrieval("C:/Users/Chris/Downloads/awp_sounds/awp/zoom.wav", "awp_boltforward", 1);
+            QueryResult result = GetBestMatchForSong("temp.mp3", 10, 109); //lenght, start
+            return result;
+        }
+
+        private Boolean HasFlash(Mat image, Double width, Double height)
+        {
+            int halfWidth = Convert.ToInt32(width / 2);
+            int halfHeight = Convert.ToInt32(height / 2);
+            int quarterWidth = halfWidth / 2;
+            int quarterHeight = halfHeight / 2;
+            Mat croppedMat = new Mat(image, new OpenCvSharp.Rect(halfWidth, halfHeight, quarterWidth, quarterHeight));
+
+            Mat orangeMat = new Mat();
+            Mat yellowMat = new Mat();
+            Mat combinedMat = new Mat();
+            Cv2.InRange(croppedMat, new Scalar(75, 123, 195), new Scalar(97, 145, 217), orangeMat); //orange
+            Cv2.InRange(croppedMat, new Scalar(94, 200, 245), new Scalar(108, 245, 255), yellowMat); //yellow
+            Cv2.AddWeighted(orangeMat, 1.0, yellowMat, 1.0, 1.0, combinedMat);
+            Cv2.Threshold(combinedMat, combinedMat, 16, 255, ThresholdTypes.Binary);
+
+            double totalPixelsFlash = quarterWidth * quarterHeight;
+            double whitePixelsFlash = Convert.ToDouble(combinedMat.CountNonZero());
+
+            return (whitePixelsFlash > (totalPixelsFlash * 0.001));
+        }
+
+        private IEnumerable<double> ProcessVideo(string videoFilePath)
+        {
+            //process video file in opencv
+            videoFilePath = videoFilePath.Replace("%20", " ");
+            VideoCapture capture = new VideoCapture(videoFilePath);
+            List<double> shotTimes = new List<double>();
+
+            using (Mat image = new Mat())
+            {
+                var previousFrameIsScope = false;
+                var currentFrameIsScope = false;
+                Boolean checkSecondFrame = false;
+
+                while (true)
+                {
+                    previousFrameIsScope = currentFrameIsScope;
+
+                    capture.Read(image);
+                    if (image.Empty())
+                            break;
+                    Mat grayMat = new Mat();
+                    Cv2.CvtColor(image, grayMat, ColorConversionCodes.BGR2GRAY);
+
+                    Cv2.Threshold(grayMat, grayMat, 16, 255, ThresholdTypes.Binary);
+                    Mat dst = new Mat();
+                    Cv2.GaussianBlur(grayMat, dst, new OpenCvSharp.Size(5, 5), 0.5, 0.5);
+
+                    double width = System.Convert.ToDouble(capture.FrameWidth);
+                    double height = System.Convert.ToDouble(capture.FrameHeight);
+                    double totalPixels = width * height;
+                    double whitePixels = System.Convert.ToDouble(grayMat.CountNonZero());
+                    double blackPixels = totalPixels - whitePixels;
+                    double minPercent = 0.45;
+                    double maxPercent = 0.9;
+                    double minBlackPixels = totalPixels * minPercent;
+                    double maxBlackPixels = totalPixels * maxPercent;
+
+                    if (blackPixels > minBlackPixels && blackPixels < maxBlackPixels)
+                    {
+                        currentFrameIsScope = true;
+                    } else
+                    {
+                        currentFrameIsScope = false;
+                    }
+
+                    if ((currentFrameIsScope == false && previousFrameIsScope == true) || checkSecondFrame == true)
+                    {
+                        //check for a muzzle flash for 2 frames after the descope
+                        if (HasFlash(image, width, height))
+                        {
+                            var offset = checkSecondFrame == true ? 2 : 1;
+                            var time = (capture.PosFrames - offset) / capture.Fps;
+                            shotTimes.Add(time);
+                            checkSecondFrame = false;
+                            /* for debugging
+                            using (new Window("capture", combinedMat))
+                            {
+                                Cv2.WaitKey();
+                            }
+                            */
+                        }
+                        else
+                        {
+                            checkSecondFrame = checkSecondFrame == true ? false : true;
+                        }
+
+
+                    }
+                } 
+            }
+
+            return shotTimes.ToArray();
+
+/*
+            //text recognition, for kill detection
+            var engine = new TesseractEngine(@"C:/Users/chris/Downloads/tessdata", "eng", EngineMode.Default);
+            var img = Pix.LoadFromFile("temp.png");
+            var page = engine.Process(img);
+            var text = page.GetText();
+            var wordString = "";
+            using (var iter = page.GetIterator())
+            {
+                iter.Begin();
+
+                do
+                {
+                    do
+                    {
+                        do
+                        {
+                            do
+                            {
+                                if (iter.IsAtBeginningOf(PageIteratorLevel.Block))
+                                {
+                                    Console.WriteLine("<BLOCK>");
+                                }
+
+                                var word = iter.GetText(PageIteratorLevel.Word);
+                                wordString = wordString + word + " ";
+
+                                if (iter.IsAtFinalOf(PageIteratorLevel.TextLine, PageIteratorLevel.Word))
+                                {
+                                    Console.WriteLine();
+                                }
+                            } while (iter.Next(PageIteratorLevel.TextLine, PageIteratorLevel.Word));
+
+                            if (iter.IsAtFinalOf(PageIteratorLevel.Para, PageIteratorLevel.TextLine))
+                            {
+                                Console.WriteLine();
+                            }
+                        } while (iter.Next(PageIteratorLevel.Para, PageIteratorLevel.TextLine));
+                    } while (iter.Next(PageIteratorLevel.Block, PageIteratorLevel.Para));
+                } while (iter.Next(PageIteratorLevel.Block));
+            }
+
+*/
+        }
+
+        public async Task<IEnumerable<double>> GetShotTimes(string videoFilePath)
+        {
+            //await Task.Run(() => ProcessAudio(videoFilePath));
+            return await Task.Run(() => ProcessVideo(videoFilePath));
+        }
+
+    }
+}