diff --git a/decoders/decoder.h b/decoders/decoder.h
index 91d9452bc..62b0f452a 100644
--- a/decoders/decoder.h
+++ b/decoders/decoder.h
@@ -14,7 +14,14 @@
  * abstraction from codecs/decoders and provide complete frames. These frames can be video or audio data and are
  * provided as Frame objects in shared pointers to alleviate the responsibility of memory handling.
  *
- * A decoder does NOT perform any pixel format conversion
+ * The main function in a decoder is Retrieve() which should return complete image/audio data. A decoder should
+ * alleviate all the complexities of codec compression from the rest of the application (i.e. a decoder should never
+ * return a partial frame or require other parts of the system to interface directly with the codec). Often this will
+ * necessitate pre-emptively caching, indexing, or even fully transcoding media before using it which can be implemented
+ * through the Analyze() function.
+ *
+ * A decoder does NOT perform any pixel/sample format conversion. Frames should pass through the PixelFormatConverter
+ * (olive::pix_fmt_conv) to be utilized in the rest of the rendering pipeline.
  */
 class Decoder : public QObject
 {
@@ -29,10 +36,64 @@ public:
   FootageStream* stream();
   void set_stream(FootageStream* fs);
 
+  /**
+   * @brief Open media/allocate memory
+   *
+   * Any file handles or memory allocation that needs to be done before this instance of a Decoder can return data
+   * should be done here.
+   *
+   * @return
+   *
+   * TRUE if successful and ready to return data, FALSE if failed to open and unable to retrieve data. If the function
+   * fails, any memory allocated should be free'd before returning FALSE, possibly by calling Close().
+   */
   virtual bool Open() = 0;
+
+  /**
+   * @brief Retrieve frame/data
+   *
+   * The main function for retrieving data from the Decoder. This function should always provide complete frame data
+   * (i.e. no partial frames or missing samples) at the timecode provided. The Decoder should perform any steps
+   * required to retrieve a complete frame separate from the rest of the program, using any form of caching/indexing
+   * to keep this as performant as possible.
+   *
+   * It's acceptable for this function to check whether the Decoder is open, and call Open() if not. If Open() returns
+   * false, this function should return nullptr.
+   *
+   * @param timecode
+   *
+   * The timecode (a rational in seconds) to retrieve the data at.
+   *
+   * @param length
+   *
+   * Audio only - ignored for video decoders. The total length of audio data to retrieve (a rational in seconds).
+   *
+   * @return
+   *
+   * A FramePtr of valid data at this timecode (of the requested length if this is audio media), or nullptr if there
+   * was nothing to retrieve at the provided timecode or the media could not be opened.
+   */
   virtual FramePtr Retrieve(const rational& timecode, const rational& length = 0) = 0;
+
+  /**
+   * @brief Close media/deallocate memory
+   *
+   * Any file handles or memory allocations opened in Open() should be cleaned up here.
+   *
+   * As the main memory freeing function, it's good practice to call this in Open() if there's an error that prevents
+   * correct function before Open() returns. As such, Close() should be prepared for not all memory/file handles to
+   * have been opened successfully.
+   */
   virtual void Close() = 0;
 
+  /**
+   * @brief Prepare footage for use by a Decoder later
+   *
+   * Needs fleshing out. This functions purpose will be to perform initial analyses of a video file. Any caching,
+   * indexing, or transcoding to help make this media performant and reliable should be done here.
+   */
+  virtual void Analyze();// = 0;
+
 protected:
   bool open_;
 
diff --git a/decoders/ffmpegvideodecoder.cpp b/decoders/ffmpegvideodecoder.cpp
index 09d3ea3e9..c4b33eee4 100644
--- a/decoders/ffmpegvideodecoder.cpp
+++ b/decoders/ffmpegvideodecoder.cpp
@@ -13,9 +13,6 @@ FramePtr FFmpegVideoDecoder::Retrieve(const rational &timecode, const rational &
     qWarning() << "Failed to open FFmpeg stream";
     return nullptr;
   }
-
-
-
   // TODO index frames
 
   int receive_ret;