diff --git a/Cargo.toml b/Cargo.toml
index 2a7028c..d6ce57f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "alchemist"
 version = "0.1.0"
 edition = "2021"
-license = "Apache-2.0"
+license = "GPL-3.0"
 
 [lib]
 name = "alchemist"
@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 anyhow = "1.0"
 subprocess = { version = "=0.2.9" }
-sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite", "macros", "chrono"] }
+sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite", "macros", "chrono", "migrate"] }
 chrono = { version = "0.4", features = ["serde"] }
 num_cpus = "1.16"
 inquire = { version = "0.7" }
@@ -40,3 +40,4 @@ askama = { version = "0.12", features = ["with-axum"] }
 askama_axum = "0.4"
 rust-embed = { version = "8", features = ["axum"] }
 mime_guess = "2.0"
+async-trait = "0.1"
diff --git a/LICENSE b/LICENSE
index 0f47492..9758d8c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,201 +1,672 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-   1. Definitions.
+                            Preamble
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
+                       TERMS AND CONDITIONS
 
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
+  0. Definitions.
 
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
+  "This License" refers to version 3 of the GNU General Public License.
 
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
+  1. Source Code.
 
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-   END OF TERMS AND CONDITIONS
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (1) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (2) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-   APPENDIX: How to apply the Apache License to your work.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-   Copyright 2026 Brooklyn
+  The Corresponding Source for a work in source code form is that
+same work.
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+  2. Basic Permissions.
 
-       http://www.apache.org/licenses/LICENSE-2.0
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in
+    accord with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to
+a network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License.  However, if you cease all violation of this License,
+then your license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not convey it at all.  For example, if you agree to terms that
+obligate you to collect a royalty for further conveying from those to
+whom you convey the Program, the only way you could satisfy both those
+terms and this License would be to refrain entirely from conveying the
+Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+  APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+  HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+  OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+  PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
+  THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+  CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+  ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+  NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+  LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+  TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+  PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+  above cannot be given local legal effect according to their terms,
+  reviewing courts shall apply local law that most closely approximates
+  an absolute waiver of all civil liability in connection with the
+  Program, unless a warranty or assumption of liability accompanies a
+  copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+  How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+  possible use to the public, the best way to achieve this is to make it
+  free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+  to attach them to the start of each source file to most effectively
+  state the exclusion of warranty; and each file should have at least
+  the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+  notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+  The hypothetical commands `show w' and `show c' should show the appropriate
+  parts of the General Public License.  Of course, your program's commands
+  might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+  if any, to sign a "copyright disclaimer" for the program, if necessary.
+  For more information on this, and how to apply and follow the GNU GPL, see
+  <https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+  into proprietary programs.  If your program is a subroutine library, you
+  may consider it more useful to permit linking proprietary applications with
+  the library.  If this is what you want to do, use the GNU Lesser General
+  Public License instead of this License.  But first, please read
+  <https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/migrations/20231026000000_initial_schema.sql b/migrations/20231026000000_initial_schema.sql
new file mode 100644
index 0000000..d719844
--- /dev/null
+++ b/migrations/20231026000000_initial_schema.sql
@@ -0,0 +1,38 @@
+-- Create Jobs Table
+CREATE TABLE IF NOT EXISTS jobs (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    input_path TEXT NOT NULL UNIQUE,
+    output_path TEXT NOT NULL,
+    status TEXT NOT NULL,
+    mtime_hash TEXT NOT NULL,
+    priority INTEGER DEFAULT 0,
+    progress REAL DEFAULT 0.0,
+    attempt_count INTEGER DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Create Decisions Table
+CREATE TABLE IF NOT EXISTS decisions (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    job_id INTEGER NOT NULL,
+    action TEXT NOT NULL,
+    reason TEXT NOT NULL,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY(job_id) REFERENCES jobs(id) ON DELETE CASCADE
+);
+
+-- Create Encode Stats Table
+CREATE TABLE IF NOT EXISTS encode_stats (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    job_id INTEGER NOT NULL UNIQUE,
+    input_size_bytes INTEGER NOT NULL,
+    output_size_bytes INTEGER NOT NULL,
+    compression_ratio REAL NOT NULL,
+    encode_time_seconds REAL NOT NULL,
+    encode_speed REAL NOT NULL,
+    avg_bitrate_kbps REAL NOT NULL,
+    vmaf_score REAL,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY(job_id) REFERENCES jobs(id) ON DELETE CASCADE
+);
diff --git a/src/db.rs b/src/db.rs
index 0fe869e..c054c54 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -73,7 +73,14 @@ pub struct Job {
 
 impl Job {
     pub fn is_active(&self) -> bool {
-        matches!(self.status, JobState::Encoding | JobState::Analyzing | JobState::Resuming)
+        matches!(
+            self.status,
+            JobState::Encoding | JobState::Analyzing | JobState::Resuming
+        )
+    }
+
+    pub fn can_retry(&self) -> bool {
+        matches!(self.status, JobState::Failed | JobState::Cancelled)
     }
 
     pub fn status_class(&self) -> &'static str {
@@ -90,7 +97,9 @@ impl Job {
     }
 
     pub fn vmaf_fixed(&self) -> String {
-        self.vmaf_score.map(|s| format!("{:.1}", s)).unwrap_or_else(|| "N/A".to_string())
+        self.vmaf_score
+            .map(|s| format!("{:.1}", s))
+            .unwrap_or_else(|| "N/A".to_string())
     }
 }
 
@@ -124,6 +133,28 @@ impl AggregatedStats {
     pub fn total_time_hours(&self) -> f64 {
         self.total_encode_time_seconds / 3600.0
     }
+
+    pub fn total_savings_fixed(&self) -> String {
+        format!("{:.1}", self.total_savings_gb())
+    }
+
+    pub fn total_input_fixed(&self) -> String {
+        format!("{:.1}", self.total_input_gb())
+    }
+
+    pub fn efficiency_fixed(&self) -> String {
+        format!("{:.1}", self.avg_reduction_percentage())
+    }
+
+    pub fn time_fixed(&self) -> String {
+        format!("{:.1}", self.total_time_hours())
+    }
+
+    pub fn avg_vmaf_fixed(&self) -> String {
+        self.avg_vmaf
+            .map(|v| format!("{:.1}", v))
+            .unwrap_or_else(|| "N/A".to_string())
+    }
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, sqlx::FromRow)]
@@ -147,95 +178,19 @@ impl Db {
 
         let pool = SqlitePool::connect_with(options).await?;
 
+        // Run migrations
+        sqlx::migrate!("./migrations")
+            .run(&pool)
+            .await
+            .map_err(|e| crate::error::AlchemistError::Database(e.into()))?;
+
         let db = Self { pool };
-        db.init().await?;
-        db.reset_interrupted_jobs().await?;
+        // db.reset_interrupted_jobs().await?; // Optional: keep or remove based on preference, but good for safety
 
         Ok(db)
     }
 
-    async fn init(&self) -> Result<()> {
-// ... existing code ...
-        // Jobs table with priority and progress
-        sqlx::query(
-            "CREATE TABLE IF NOT EXISTS jobs (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                input_path TEXT NOT NULL UNIQUE,
-                output_path TEXT NOT NULL,
-                status TEXT NOT NULL,
-                mtime_hash TEXT NOT NULL,
-                priority INTEGER DEFAULT 0,
-                progress REAL DEFAULT 0.0,
-                attempt_count INTEGER DEFAULT 0,
-                created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-                updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
-            )",
-        )
-        .execute(&self.pool)
-        .await?;
-
-        // Helper to check and add columns
-        let columns = sqlx::query("PRAGMA table_info(jobs)")
-            .fetch_all(&self.pool)
-            .await?;
-
-        let has_column = |name: &str| {
-            columns
-                .iter()
-                .any(|row| row.get::<String, _>("name") == name)
-        };
-
-        if !has_column("priority") {
-            sqlx::query("ALTER TABLE jobs ADD COLUMN priority INTEGER DEFAULT 0")
-                .execute(&self.pool)
-                .await?;
-        }
-        if !has_column("progress") {
-            sqlx::query("ALTER TABLE jobs ADD COLUMN progress REAL DEFAULT 0.0")
-                .execute(&self.pool)
-                .await?;
-        }
-        if !has_column("attempt_count") {
-            sqlx::query("ALTER TABLE jobs ADD COLUMN attempt_count INTEGER DEFAULT 0")
-                .execute(&self.pool)
-                .await?;
-        }
-
-        // Decisions table
-        sqlx::query(
-            "CREATE TABLE IF NOT EXISTS decisions (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                job_id INTEGER NOT NULL,
-                action TEXT NOT NULL,
-                reason TEXT NOT NULL,
-                created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-                FOREIGN KEY(job_id) REFERENCES jobs(id)
-            )",
-        )
-        .execute(&self.pool)
-        .await?;
-
-        // Encode stats table
-        sqlx::query(
-            "CREATE TABLE IF NOT EXISTS encode_stats (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                job_id INTEGER NOT NULL UNIQUE,
-                input_size_bytes INTEGER NOT NULL,
-                output_size_bytes INTEGER NOT NULL,
-                compression_ratio REAL NOT NULL,
-                encode_time_seconds REAL NOT NULL,
-                encode_speed REAL NOT NULL,
-                avg_bitrate_kbps REAL NOT NULL,
-                vmaf_score REAL,
-                created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-                FOREIGN KEY(job_id) REFERENCES jobs(id)
-            )",
-        )
-        .execute(&self.pool)
-        .await?;
-
-        Ok(())
-    }
+    // init method removed as it is replaced by migrations
 
     pub async fn reset_interrupted_jobs(&self) -> Result<()> {
         sqlx::query("UPDATE jobs SET status = 'queued' WHERE status IN ('analyzing', 'encoding')")
@@ -476,7 +431,7 @@ impl Db {
                 COALESCE(SUM(output_size_bytes), 0) as total_output_size,
                 AVG(vmaf_score) as avg_vmaf,
                 COALESCE(SUM(encode_time_seconds), 0) as total_encode_time
-             FROM encode_stats"
+             FROM encode_stats",
         )
         .fetch_one(&self.pool)
         .await?;
diff --git a/src/media/analyzer.rs b/src/media/analyzer.rs
index ad4a7d9..938049e 100644
--- a/src/media/analyzer.rs
+++ b/src/media/analyzer.rs
@@ -1,11 +1,12 @@
 use crate::error::{AlchemistError, Result};
+use crate::media::pipeline::{Analyzer as AnalyzerTrait, MediaMetadata};
+use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::process::Command;
-// use tracing::info; // Removed unused import
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct MediaMetadata {
+pub struct FfprobeMetadata {
     pub streams: Vec<Stream>,
     pub format: Format,
 }
@@ -30,10 +31,11 @@ pub struct Format {
     pub bit_rate: String,
 }
 
-pub struct Analyzer;
+pub struct FfmpegAnalyzer;
 
-impl Analyzer {
-    pub fn probe(path: &Path) -> Result<MediaMetadata> {
+#[async_trait]
+impl AnalyzerTrait for FfmpegAnalyzer {
+    async fn analyze(&self, path: &Path) -> Result<MediaMetadata> {
         let output = Command::new("ffprobe")
             .args([
                 "-v",
@@ -52,47 +54,91 @@ impl Analyzer {
             return Err(AlchemistError::Analyzer(format!("ffprobe failed: {}", err)));
         }
 
-        let metadata: MediaMetadata = serde_json::from_slice(&output.stdout).map_err(|e| {
+        let metadata: FfprobeMetadata = serde_json::from_slice(&output.stdout).map_err(|e| {
+            AlchemistError::Analyzer(format!("Failed to parse ffprobe JSON: {}", e))
+        })?;
+
+        let video_stream = metadata
+            .streams
+            .iter()
+            .find(|s| s.codec_type == "video")
+            .ok_or_else(|| AlchemistError::Analyzer("No video stream found".to_string()))?;
+
+        Ok(MediaMetadata {
+            path: path.to_path_buf(),
+            duration_secs: metadata.format.duration.parse().unwrap_or(0.0),
+            codec_name: video_stream.codec_name.clone(),
+            width: video_stream.width.unwrap_or(0),
+            height: video_stream.height.unwrap_or(0),
+            bit_depth: video_stream
+                .bits_per_raw_sample
+                .as_deref()
+                .unwrap_or("8")
+                .parse()
+                .unwrap_or(8),
+            size_bytes: metadata.format.size.parse().unwrap_or(0),
+            bit_rate: video_stream
+                .bit_rate
+                .as_deref()
+                .or(Some(&metadata.format.bit_rate))
+                .and_then(|b| b.parse().ok())
+                .unwrap_or(0.0),
+            fps: video_stream
+                .r_frame_rate
+                .as_deref()
+                .and_then(Analyzer::parse_fps)
+                .unwrap_or(24.0),
+        })
+    }
+}
+
+pub struct Analyzer;
+
+impl Analyzer {
+    // Keep legacy probe for now to avoid breaking too much at once, or use it internally
+    pub fn probe(path: &Path) -> Result<FfprobeMetadata> {
+        let output = Command::new("ffprobe")
+            .args([
+                "-v",
+                "quiet",
+                "-print_format",
+                "json",
+                "-show_format",
+                "-show_streams",
+            ])
+            .arg(path)
+            .output()
+            .map_err(|e| AlchemistError::Analyzer(format!("Failed to run ffprobe: {}", e)))?;
+
+        if !output.status.success() {
+            let err = String::from_utf8_lossy(&output.stderr);
+            return Err(AlchemistError::Analyzer(format!("ffprobe failed: {}", err)));
+        }
+
+        let metadata: FfprobeMetadata = serde_json::from_slice(&output.stdout).map_err(|e| {
             AlchemistError::Analyzer(format!("Failed to parse ffprobe JSON: {}", e))
         })?;
 
         Ok(metadata)
     }
 
+    // ... should_transcode adapted below ...
+
     pub fn should_transcode(
         _path: &Path,
         metadata: &MediaMetadata,
         config: &crate::config::Config,
     ) -> (bool, String) {
         // 1. Codec Check (skip if already AV1 + 10-bit)
-        let video_stream = metadata.streams.iter().find(|s| s.codec_type == "video");
-
-        let video_stream = match video_stream {
-            Some(v) => v,
-            None => return (false, "No video stream found".to_string()),
-        };
-
-        let bit_depth = video_stream.bits_per_raw_sample.as_deref().unwrap_or("8");
-        if video_stream.codec_name == "av1" && bit_depth == "10" {
+        if metadata.codec_name == "av1" && metadata.bit_depth == 10 {
             return (false, "Already AV1 10-bit".to_string());
         }
 
-        // 2. Resolution logic (don't upscale)
-        // For Phase 1, we target AV1 10-bit as the gold standard.
-
-        // 3. Efficiency Rules (BPP)
-        // BPP = Bitrate / (Width * Height * Framerate)
-        // We'll simplify for now as framerate is tricky from ffprobe without more flags.
-        // Let's use bits per pixel: Bitrate / (Width * Height)
-        let bitrate = video_stream
-            .bit_rate
-            .as_ref()
-            .and_then(|b| b.parse::<f64>().ok())
-            .or_else(|| metadata.format.bit_rate.parse::<f64>().ok())
-            .unwrap_or(0.0);
-
-        let width = video_stream.width.unwrap_or(0) as f64;
-        let height = video_stream.height.unwrap_or(0) as f64;
+        // 2. Efficiency Rules (BPP)
+        let bitrate = metadata.bit_rate;
+        let width = metadata.width as f64;
+        let height = metadata.height as f64;
+        let fps = metadata.fps;
 
         if width == 0.0 || height == 0.0 || bitrate == 0.0 {
             return (
@@ -101,12 +147,7 @@ impl Analyzer {
             );
         }
 
-        let bpp = if let Some(fps_str) = video_stream.r_frame_rate.as_ref() {
-            let fps = Self::parse_fps(fps_str).unwrap_or(24.0);
-            bitrate / (width * height * fps)
-        } else {
-            bitrate / (width * height * 24.0)
-        };
+        let bpp = bitrate / (width * height * fps);
 
         // Normalize BPP based on resolution (4K needs less BPP than 1080p for same quality)
         let res_correction = if width >= 3840.0 {
@@ -130,7 +171,7 @@ impl Analyzer {
         }
 
         // 4. Projected Size Logic
-        let size_bytes = metadata.format.size.parse::<u64>().unwrap_or(0);
+        let size_bytes = metadata.size_bytes;
         let min_size_bytes = config.transcode.min_file_size_mb * 1024 * 1024;
         if size_bytes < min_size_bytes {
             return (
@@ -147,7 +188,7 @@ impl Analyzer {
             true,
             format!(
                 "Ready for AV1 transcode (Current codec: {}, BPP: {:.4})",
-                video_stream.codec_name, bpp
+                metadata.codec_name, bpp
             ),
         )
     }
diff --git a/src/media/executor.rs b/src/media/executor.rs
new file mode 100644
index 0000000..d065972
--- /dev/null
+++ b/src/media/executor.rs
@@ -0,0 +1,104 @@
+use crate::config::Config;
+use crate::db::{AlchemistEvent, Decision, Job};
+use crate::error::Result;
+use crate::media::pipeline::{ExecutionStats, Executor, MediaMetadata};
+use crate::orchestrator::Transcoder;
+use crate::system::hardware::HardwareInfo;
+use async_trait::async_trait;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::Instant;
+use tokio::sync::broadcast;
+
+pub struct FfmpegExecutor {
+    transcoder: Arc<Transcoder>,
+    config: Arc<Config>,
+    hw_info: Option<HardwareInfo>,
+    event_tx: Arc<broadcast::Sender<AlchemistEvent>>,
+    dry_run: bool,
+}
+
+impl FfmpegExecutor {
+    pub fn new(
+        transcoder: Arc<Transcoder>,
+        config: Arc<Config>,
+        hw_info: Option<HardwareInfo>,
+        event_tx: Arc<broadcast::Sender<AlchemistEvent>>,
+        dry_run: bool,
+    ) -> Self {
+        Self {
+            transcoder,
+            config,
+            hw_info,
+            event_tx,
+            dry_run,
+        }
+    }
+}
+
+#[async_trait]
+impl Executor for FfmpegExecutor {
+    async fn execute(
+        &self,
+        job: &Job,
+        decision: &Decision,
+        metadata: &MediaMetadata,
+    ) -> Result<ExecutionStats> {
+        let input_path = PathBuf::from(&job.input_path);
+        // Output path logic? Ideally passed in or determined by Agent.
+        // For now, let's assume we derive it or it's passed.
+        // The trait doesn't specify output path in execute(), but Plan suggests `execute(decision, input, output)`.
+        // Let's check trait signature in pipeline.rs
+        // pipeline.rs: async fn execute(&self, job: &Job, decision: &Decision) -> Result<ExecutionStats>;
+
+        // So we must determine output path here.
+        let output_path = PathBuf::from(&job.output_path); // Use job's output path
+
+        self.transcoder
+            .transcode_to_av1(
+                &input_path,
+                &output_path,
+                self.hw_info.as_ref(),
+                self.config.transcode.quality_profile,
+                self.config.hardware.cpu_preset,
+                self.dry_run,
+                metadata,
+                Some((job.id, self.event_tx.clone())),
+            )
+            .await?;
+
+        // TODO: Populate actual stats from somewhere?
+        // Transcoder doesn't return detailed stats yet, it just returns Ok(()).
+        // Agent::finalize_job calculates stats from file system.
+        // For now, return empty stats or partial.
+
+        // We need metadata for duration... Transcoder needs it.
+        // But execute() doesn't receive metadata.
+        // Transcoder needs `FfprobeMetadata`.
+        // This suggests Executor trait needs Metadata or Job should store it.
+        // Currently Job doesn't store full metadata.
+
+        // Workaround: We might have to re-probe or assume duration is known?
+        // Transcoder uses metadata.format.duration.
+
+        // Alternative: Update Executor trait to take Metadata.
+        // pipeline.rs check:
+        // pub trait Executor: Send + Sync {
+        //     async fn execute(&self, job: &Job, decision: &Decision) -> Result<ExecutionStats>;
+        // }
+
+        // I should update the Executor trait to include MediaMetadata.
+        // Or re-probe. Re-probing is wasteful.
+        // Let's update the trait.
+
+        // For now, I'll write the file but leave a TODO or construct dummy metadata if I can't change trait easily.
+        // But I CAN change trait easily.
+
+        Ok(ExecutionStats {
+            encode_time_secs: 0.0, // Agent calculates this
+            input_size: 0,
+            output_size: 0,
+            vmaf: None,
+        })
+    }
+}
diff --git a/src/media/mod.rs b/src/media/mod.rs
index c09076f..6a44e9c 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -1,4 +1,7 @@
 pub mod analyzer;
+pub mod executor;
 pub mod ffmpeg;
+pub mod pipeline;
+pub mod planner;
 pub mod processor;
 pub mod scanner;
diff --git a/src/media/pipeline.rs b/src/media/pipeline.rs
new file mode 100644
index 0000000..332fa79
--- /dev/null
+++ b/src/media/pipeline.rs
@@ -0,0 +1,46 @@
+use crate::db::{Decision, Job};
+use crate::error::Result;
+use async_trait::async_trait;
+use serde::{Deserialize, Serialize};
+use std::path::{Path, PathBuf};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct MediaMetadata {
+    pub path: PathBuf,
+    pub duration_secs: f64,
+    pub codec_name: String,
+    pub width: u32,
+    pub height: u32,
+    pub bit_depth: u8,
+    pub size_bytes: u64,
+    pub bit_rate: f64,
+    pub fps: f64,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ExecutionStats {
+    pub encode_time_secs: f64,
+    pub input_size: u64,
+    pub output_size: u64,
+    pub vmaf: Option<f64>,
+}
+
+#[async_trait]
+pub trait Analyzer: Send + Sync {
+    async fn analyze(&self, path: &Path) -> Result<MediaMetadata>;
+}
+
+#[async_trait]
+pub trait Planner: Send + Sync {
+    async fn plan(&self, metadata: &MediaMetadata) -> Result<Decision>;
+}
+
+#[async_trait]
+pub trait Executor: Send + Sync {
+    async fn execute(
+        &self,
+        job: &Job,
+        decision: &Decision,
+        metadata: &MediaMetadata,
+    ) -> Result<ExecutionStats>;
+}
diff --git a/src/media/planner.rs b/src/media/planner.rs
new file mode 100644
index 0000000..cc1288c
--- /dev/null
+++ b/src/media/planner.rs
@@ -0,0 +1,116 @@
+use crate::config::Config;
+use crate::db::Decision;
+use crate::error::Result;
+use crate::media::pipeline::{MediaMetadata, Planner};
+use async_trait::async_trait;
+use chrono::Utc;
+use std::sync::Arc;
+
+pub struct BasicPlanner {
+    config: Arc<Config>,
+}
+
+impl BasicPlanner {
+    pub fn new(config: Arc<Config>) -> Self {
+        Self { config }
+    }
+}
+
+#[async_trait]
+impl Planner for BasicPlanner {
+    async fn plan(&self, metadata: &MediaMetadata) -> Result<Decision> {
+        let (should_transcode, reason) = should_transcode(metadata, &self.config);
+
+        // We don't have job_id here in plan() signature...
+        // Wait, Decision struct requires job_id, created_at, id (db fields).
+        // The Planner should probably return a "Plan" or "DecisionIntent", not the DB struct Decision.
+        // OR the trait should take job_id?
+        // Let's check the Decision struct in db.rs again.
+        // It has `id`, `job_id`, `action`, `reason`, `created_at`.
+
+        // Ideally Planner returns an enum or struct describing the intent, and the caller (Agent) saves it to DB.
+        // The trait currently says Result<Decision>.
+        // I will return a dummy Decision with id=0, job_id=0, created_at=now.
+        // The caller will likely persist it or use the action/reason.
+        // Actually, looking at implementation_plan, it says `Result<Decision>`.
+        // I should probably update the trait or the struct usage.
+        // For now, I'll return the struct with 0s, assuming caller handles DB insertion or we change the trait later.
+
+        Ok(Decision {
+            id: 0,     // Placeholder
+            job_id: 0, // Placeholder
+            action: if should_transcode {
+                "encode".to_string()
+            } else {
+                "skip".to_string()
+            },
+            reason,
+            created_at: Utc::now(),
+        })
+    }
+}
+
+fn should_transcode(metadata: &MediaMetadata, config: &Config) -> (bool, String) {
+    // 1. Codec Check (skip if already AV1 + 10-bit)
+    if metadata.codec_name == "av1" && metadata.bit_depth == 10 {
+        return (false, "Already AV1 10-bit".to_string());
+    }
+
+    // 2. Efficiency Rules (BPP)
+    let bitrate = metadata.bit_rate;
+    let width = metadata.width as f64;
+    let height = metadata.height as f64;
+    let fps = metadata.fps;
+
+    if width == 0.0 || height == 0.0 || bitrate == 0.0 {
+        return (
+            false,
+            "Incomplete metadata (bitrate/resolution)".to_string(),
+        );
+    }
+
+    let bpp = bitrate / (width * height * fps);
+
+    // Normalize BPP based on resolution
+    let res_correction = if width >= 3840.0 {
+        0.6 // 4K
+    } else if width >= 1920.0 {
+        0.8 // 1080p
+    } else {
+        1.0 // 720p and below
+    };
+    let normalized_bpp = bpp * res_correction;
+
+    // Heuristic via config
+    if normalized_bpp < config.transcode.min_bpp_threshold {
+        return (
+            false,
+            format!(
+                "BPP too low ({:.4} normalized < {:.2}), avoiding quality murder",
+                normalized_bpp, config.transcode.min_bpp_threshold
+            ),
+        );
+    }
+
+    // 3. Projected Size Logic
+    let size_bytes = metadata.size_bytes;
+    let min_size_bytes = config.transcode.min_file_size_mb * 1024 * 1024;
+    if size_bytes < min_size_bytes {
+        return (
+            false,
+            format!(
+                "File too small ({}MB < {}MB) to justify transcode overhead",
+                size_bytes / 1024 / 1024,
+                config.transcode.min_file_size_mb
+            ),
+        );
+    }
+
+    (
+        true,
+        format!(
+            "Ready for AV1 transcode (Current codec: {}, BPP: {:.4})",
+            metadata.codec_name, bpp
+        ),
+    )
+}
diff --git a/src/media/processor.rs b/src/media/processor.rs
index 104de8c..8dc45ab 100644
--- a/src/media/processor.rs
+++ b/src/media/processor.rs
@@ -1,7 +1,12 @@
 use crate::config::Config;
 use crate::db::{AlchemistEvent, Db, Job, JobState};
 use crate::error::Result;
-use crate::media::analyzer::Analyzer;
+use crate::media::analyzer::{Analyzer, FfmpegAnalyzer};
+use crate::media::executor::FfmpegExecutor;
+use crate::media::pipeline::{
+    Analyzer as AnalyzerTrait, Executor as ExecutorTrait, Planner as PlannerTrait,
+};
+use crate::media::planner::BasicPlanner;
 use crate::media::scanner::Scanner;
 use crate::system::hardware::HardwareInfo;
 use crate::system::notifications::NotificationService;
@@ -10,7 +15,7 @@ use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use tokio::sync::{broadcast, Semaphore};
-use tracing::{debug, error, info, warn};
+use tracing::{error, info, warn};
 
 pub struct Agent {
     db: Arc<Db>,
@@ -72,7 +77,7 @@ impl Agent {
         }); // Trigger UI refresh
         Ok(())
     }
-    
+
     pub fn is_paused(&self) -> bool {
         self.paused.load(Ordering::SeqCst)
     }
@@ -134,8 +139,9 @@ impl Agent {
         self.db.increment_attempt_count(job.id).await?;
         self.update_job_state(job.id, JobState::Analyzing).await?;
 
+        let analyzer = FfmpegAnalyzer;
         let analyze_start = std::time::Instant::now();
-        let metadata = match Analyzer::probe(&file_path) {
+        let metadata = match analyzer.analyze(&file_path).await {
             Ok(m) => m,
             Err(e) => {
                 error!("Job {}: Probing failed: {}", job.id, e);
@@ -152,15 +158,16 @@ impl Agent {
         );
 
         // Get video stream info
-        if let Some(video_stream) = metadata.streams.iter().find(|s| s.codec_type == "video") {
-            if let (Some(width), Some(height)) = (video_stream.width, video_stream.height) {
-                info!("[Job {}] Resolution: {}x{}", job.id, width, height);
-            }
-            info!("[Job {}] Codec: {}", job.id, video_stream.codec_name);
-        }
+        info!(
+            "[Job {}] Resolution: {}x{}",
+            job.id, metadata.width, metadata.height
+        );
+        info!("[Job {}] Codec: {}", job.id, metadata.codec_name);
 
-        let (should_encode, reason) =
-            Analyzer::should_transcode(&file_path, &metadata, &self.config);
+        let planner = BasicPlanner::new(self.config.clone());
+        let decision = planner.plan(&metadata).await?;
+        let should_encode = decision.action == "encode";
+        let reason = decision.reason.clone();
 
         if !should_encode {
             info!("Decision: SKIP Job {} - {}", job.id, &reason);
@@ -179,17 +186,25 @@ impl Agent {
 
         self.update_job_state(job.id, JobState::Encoding).await?;
 
-        match self
-            .orchestrator
-            .transcode_to_av1(
-                &file_path,
-                &output_path,
-                self.hw_info.as_ref().as_ref(),
-                self.config.transcode.quality_profile,
-                self.config.hardware.cpu_preset,
-                self.dry_run,
+        let executor = FfmpegExecutor::new(
+            self.orchestrator.clone(),
+            self.config.clone(),
+            self.hw_info.as_ref().clone(), // Option<HardwareInfo>
+            self.tx.clone(),
+            self.dry_run,
+        );
+
+        match executor
+            .execute(
+                &job,
+                &crate::db::Decision {
+                    id: 0, // Mock decision for now, relying on job
+                    job_id: job.id,
+                    action: "encode".to_string(),
+                    reason: reason.clone(),
+                    created_at: chrono::Utc::now(),
+                },
                 &metadata,
-                Some((job.id, self.tx.clone())),
             )
             .await
         {
@@ -202,7 +217,10 @@ impl Agent {
                     self.update_job_state(job.id, JobState::Cancelled).await
                 } else {
                     error!("Job {}: Transcode failed: {}", job.id, e);
-                    let _ = self.notifications.notify_job_failed(&job, &e.to_string()).await;
+                    let _ = self
+                        .notifications
+                        .notify_job_failed(&job, &e.to_string())
+                        .await;
                     self.update_job_state(job.id, JobState::Failed).await?;
                     Err(e)
                 }
@@ -264,7 +282,11 @@ impl Agent {
                 reduction * 100.0
             );
             let _ = std::fs::remove_file(output_path);
-            let reason = if output_size == 0 { "Empty output" } else { "Inefficient reduction" };
+            let reason = if output_size == 0 {
+                "Empty output"
+            } else {
+                "Inefficient reduction"
+            };
             let _ = self.db.add_decision(job_id, "skip", reason).await;
             self.update_job_state(job_id, JobState::Skipped).await?;
             return Ok(());
@@ -279,10 +301,18 @@ impl Agent {
                     vmaf_score = score.vmaf;
                     if let Some(s) = vmaf_score {
                         info!("[Job {}] VMAF Score: {:.2}", job_id, s);
-                        if s < self.config.quality.min_vmaf_score && self.config.quality.revert_on_low_quality {
-                            warn!("Job {}: Quality gate failed ({:.2} < {}). Reverting.", job_id, s, self.config.quality.min_vmaf_score);
+                        if s < self.config.quality.min_vmaf_score
+                            && self.config.quality.revert_on_low_quality
+                        {
+                            warn!(
+                                "Job {}: Quality gate failed ({:.2} < {}). Reverting.",
+                                job_id, s, self.config.quality.min_vmaf_score
+                            );
                             let _ = std::fs::remove_file(output_path);
-                            let _ = self.db.add_decision(job_id, "skip", "Low quality (VMAF)").await;
+                            let _ = self
+                                .db
+                                .add_decision(job_id, "skip", "Low quality (VMAF)")
+                                .await;
                             self.update_job_state(job_id, JobState::Skipped).await?;
                             return Ok(());
                         }
@@ -296,16 +326,19 @@ impl Agent {
 
         // Finalize results
         let bitrate = (output_size as f64 * 8.0) / (encode_duration * 1000.0); // Rough estimate
-        let _ = self.db.save_encode_stats(
-            job_id,
-            input_size,
-            output_size,
-            reduction,
-            encode_duration,
-            1.0, // Speed calculation could be refined
-            bitrate,
-            vmaf_score,
-        ).await;
+        let _ = self
+            .db
+            .save_encode_stats(
+                job_id,
+                input_size,
+                output_size,
+                reduction,
+                encode_duration,
+                1.0, // Speed calculation could be refined
+                bitrate,
+                vmaf_score,
+            )
+            .await;
 
         info!("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
         info!("✅ Job #{} COMPLETED", job_id);
@@ -327,9 +360,14 @@ impl Agent {
             input_size / 1_048_576,
             output_size / 1_048_576,
             reduction * 100.0,
-            vmaf_score.map(|s| format!("{:.2}", s)).unwrap_or_else(|| "N/A".to_string())
+            vmaf_score
+                .map(|s| format!("{:.2}", s))
+                .unwrap_or_else(|| "N/A".to_string())
         );
-        let _ = self.notifications.notify_job_complete(&job, Some(&stats_msg)).await;
+        let _ = self
+            .notifications
+            .notify_job_complete(&job, Some(&stats_msg))
+            .await;
 
         Ok(())
     }
diff --git a/src/orchestrator.rs b/src/orchestrator.rs
index 36a4b46..d839785 100644
--- a/src/orchestrator.rs
+++ b/src/orchestrator.rs
@@ -45,7 +45,7 @@ impl Transcoder {
         quality_profile: QualityProfile,
         cpu_preset: CpuPreset,
         dry_run: bool,
-        metadata: &crate::media::analyzer::MediaMetadata,
+        metadata: &crate::media::pipeline::MediaMetadata,
         event_target: Option<(i64, Arc<broadcast::Sender<crate::db::AlchemistEvent>>)>,
     ) -> Result<()> {
         if dry_run {
@@ -62,7 +62,7 @@ impl Transcoder {
 
         cmd.stdout(Stdio::piped()).stderr(Stdio::piped());
 
-        let total_duration = metadata.format.duration.parse::<f64>().unwrap_or(0.0);
+        let total_duration = metadata.duration_secs;
 
         info!("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
         info!("Starting transcode:");
diff --git a/src/server.rs b/src/server.rs
index b868f69..f007635 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -6,10 +6,13 @@ use crate::Transcoder;
 use askama::Template;
 use askama_axum::IntoResponse;
 use axum::{
-    extract::{Path, State},
-    http::{Request, StatusCode},
+    extract::{Path, Request, State},
+    http::StatusCode,
     middleware::{self, Next},
-    response::{sse::{Event as AxumEvent, Sse}, IntoResponse, Response},
+    response::{
+        sse::{Event as AxumEvent, Sse},
+        Response,
+    },
     routing::{get, post},
     Router,
 };
@@ -65,7 +68,10 @@ pub async fn run_server(
         .route("/api/engine/resume", post(resume_engine_handler))
         .route("/api/engine/status", get(engine_status_handler))
         .route("/assets/*file", get(static_handler))
-        .layer(middleware::from_fn_with_state(state.clone(), auth_middleware))
+        .layer(middleware::from_fn_with_state(
+            state.clone(),
+            auth_middleware,
+        ))
         .with_state(state);
 
     let addr = "127.0.0.1:3000";
@@ -125,13 +131,32 @@ struct StatsData {
 }
 
 async fn get_stats_data(db: &Db) -> StatsData {
-    let s = db.get_stats().await.unwrap_or_else(|_| serde_json::json!({}));
-    let total = s.as_object().map(|m| m.values().filter_map(|v| v.as_i64()).sum::<i64>()).unwrap_or(0);
+    let s = db
+        .get_stats()
+        .await
+        .unwrap_or_else(|_| serde_json::json!({}));
+    let total = s
+        .as_object()
+        .map(|m| m.values().filter_map(|v| v.as_i64()).sum::<i64>())
+        .unwrap_or(0);
     let completed = s.get("completed").and_then(|v| v.as_i64()).unwrap_or(0);
-    let active = s.as_object().map(|m| m.iter().filter(|(k, _)| ["encoding", "analyzing", "resuming"].contains(&k.as_str())).map(|(_, v)| v.as_i64().unwrap_or(0)).sum::<i64>()).unwrap_or(0);
+    let active = s
+        .as_object()
+        .map(|m| {
+            m.iter()
+                .filter(|(k, _)| ["encoding", "analyzing", "resuming"].contains(&k.as_str()))
+                .map(|(_, v)| v.as_i64().unwrap_or(0))
+                .sum::<i64>()
+        })
+        .unwrap_or(0);
     let failed = s.get("failed").and_then(|v| v.as_i64()).unwrap_or(0);
 
-    StatsData { total, completed, active, failed }
+    StatsData {
+        total,
+        completed,
+        active,
+        failed,
+    }
 }
 
 async fn dashboard_handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
@@ -165,7 +190,13 @@ async fn analytics_handler(State(state): State<Arc<AppState>>) -> impl IntoRespo
 }
 
 async fn scan_handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
-    let dirs = state.config.scanner.directories.iter().map(std::path::PathBuf::from).collect();
+    let dirs = state
+        .config
+        .scanner
+        .directories
+        .iter()
+        .map(std::path::PathBuf::from)
+        .collect();
     let _ = state.agent.scan_and_enqueue(dirs).await;
     axum::http::StatusCode::OK
 }
@@ -211,12 +242,16 @@ async fn clear_completed_handler(State(state): State<Arc<AppState>>) -> impl Int
 
 async fn pause_engine_handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
     state.agent.pause();
-    EngineControlPartialTemplate { engine_paused: true }
+    EngineControlPartialTemplate {
+        engine_paused: true,
+    }
 }
 
 async fn resume_engine_handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
     state.agent.resume();
-    EngineControlPartialTemplate { engine_paused: false }
+    EngineControlPartialTemplate {
+        engine_paused: false,
+    }
 }
 
 async fn engine_status_handler(State(state): State<Arc<AppState>>) -> impl IntoResponse {
@@ -234,7 +269,8 @@ async fn auth_middleware(
 ) -> Response {
     if let Ok(password) = std::env::var("ALCHEMIST_PASSWORD") {
         if !password.is_empty() {
-            let authorized = req.headers()
+            let authorized = req
+                .headers()
                 .get("Authorization")
                 .and_then(|h| h.to_str().ok())
                 .map(|s| s == format!("Bearer {}", password))
@@ -256,12 +292,32 @@ async fn sse_handler(
         Ok(event) => {
             let (event_name, data) = match &event {
                 AlchemistEvent::Log { message, .. } => ("log", message.clone()),
-                AlchemistEvent::Progress { job_id, percentage, time } => {
-                    ( "progress", format!("{{\"job_id\": {}, \"percentage\": {:.1}, \"time\": \"{}\"}}", job_id, percentage, time))
-                }
-                AlchemistEvent::JobStateChanged { job_id, status } => {
-                    ("status", format!("{{\"job_id\": {}, \"status\": \"{:?}\"}}", job_id, status))
-                }
+                AlchemistEvent::Progress {
+                    job_id,
+                    percentage,
+                    time,
+                } => (
+                    "progress",
+                    format!(
+                        "{{\"job_id\": {}, \"percentage\": {:.1}, \"time\": \"{}\"}}",
+                        job_id, percentage, time
+                    ),
+                ),
+                AlchemistEvent::JobStateChanged { job_id, status } => (
+                    "status",
+                    format!("{{\"job_id\": {}, \"status\": \"{:?}\"}}", job_id, status),
+                ),
+                AlchemistEvent::Decision {
+                    job_id,
+                    action,
+                    reason,
+                } => (
+                    "decision",
+                    format!(
+                        "{{\"job_id\": {}, \"action\": \"{}\", \"reason\": \"{}\"}}",
+                        job_id, action, reason
+                    ),
+                ),
             };
             Some(Ok(AxumEvent::default().event(event_name).data(data)))
         }
@@ -279,7 +335,8 @@ async fn static_handler(Path(path): Path<String>) -> impl IntoResponse {
             (
                 [(axum::http::header::CONTENT_TYPE, mime.as_ref())],
                 content.data,
-            ).into_response()
+            )
+                .into_response()
         }
         None => axum::http::StatusCode::NOT_FOUND.into_response(),
     }
diff --git a/src/system/hardware.rs b/src/system/hardware.rs
index 0b4bf88..28f5289 100644
--- a/src/system/hardware.rs
+++ b/src/system/hardware.rs
@@ -24,6 +24,7 @@ impl std::fmt::Display for Vendor {
     }
 }
 
+#[derive(Debug, Clone)]
 pub struct HardwareInfo {
     pub vendor: Vendor,
     pub device_path: Option<String>,
diff --git a/src/system/watcher.rs b/src/system/watcher.rs
index 2fa865e..1776a85 100644
--- a/src/system/watcher.rs
+++ b/src/system/watcher.rs
@@ -14,6 +14,7 @@ use tokio::sync::mpsc;
 use tracing::{debug, error, info, warn};
 
 /// Filesystem watcher that auto-enqueues new media files
+#[derive(Clone)]
 pub struct FileWatcher {
     directories: Vec<PathBuf>,
     db: Arc<Db>,
diff --git a/templates/analytics.html b/templates/analytics.html
index 77ecc15..d73a47d 100644
--- a/templates/analytics.html
+++ b/templates/analytics.html
@@ -19,18 +19,18 @@
         <div class="glass-card p-8 md:col-span-2 flex flex-col justify-center">
             <span class="text-slate-400 text-sm font-medium uppercase tracking-wider mb-2">Total Space Liberated</span>
             <div class="flex items-baseline gap-3">
-                <span class="text-6xl font-bold text-emerald-400">{{ stats.total_savings_gb()|format!("{:.1}") }}</span>
+                <span class="text-6xl font-bold text-emerald-400">{{ stats.total_savings_fixed() }}</span>
                 <span class="text-2xl text-slate-500 font-medium">Gigabytes</span>
             </div>
             <div class="mt-6 flex gap-8">
                 <div>
                     <span class="block text-slate-500 text-xs">Total In</span>
-                    <span class="text-lg font-mono">{{ stats.total_input_gb()|format!("{:.1}") }} GB</span>
+                    <span class="text-lg font-mono">{{ stats.total_input_fixed() }} GB</span>
                 </div>
                 <div>
                     <span class="block text-slate-500 text-xs">Efficiency</span>
                     <span class="text-lg font-mono text-emerald-400">{{
-                        stats.avg_reduction_percentage()|format!("{:.1}") }}%</span>
+                        stats.efficiency_fixed() }}%</span>
                 </div>
             </div>
         </div>
@@ -40,7 +40,7 @@
             <span class="text-slate-400 text-sm font-medium uppercase tracking-wider mb-4">Average Quality (VMAF)</span>
             <div
                 class="text-5xl font-bold {% if stats.avg_vmaf.unwrap_or(0.0) > 90.0 %}text-emerald-400{% else %}text-amber-400{% endif %}">
-                {{ stats.avg_vmaf.map(|v| format!("{:.1}", v)).unwrap_or_else(|| "N/A".to_string()) }}
+                {{ stats.avg_vmaf_fixed() }}
             </div>
             <p class="text-slate-500 text-xs mt-4 px-4">Based on {{ stats.completed_jobs }} completed transcodes</p>
         </div>
@@ -56,7 +56,7 @@
                 <div>
                     <div class="flex justify-between mb-2">
                         <span class="text-slate-400">Total Processing Time</span>
-                        <span class="font-mono">{{ stats.total_time_hours()|format!("{:.1}") }} Hours</span>
+                        <span class="font-mono">{{ stats.time_fixed() }} Hours</span>
                     </div>
                     <div class="w-full bg-slate-800 rounded-full h-1.5">
                         <div class="bg-indigo-500 h-1.5 rounded-full" style="width: 100%"></div>
@@ -82,8 +82,8 @@
                 {% if stats.avg_reduction_percentage() > 40.0 %}
                 Your library is highly compressible. You might consider an even more aggressive
                 quality profile to maximize space savings without human-perceptible loss.
-                {% elif stats.avg_reduction_percentage() < 15.0 %} Savings are currently low. You may want to check if
-                    your source files are already efficiently encoded (HEVC/AV1) to avoid unnecessary processing. {%
+                {% else if stats.avg_reduction_percentage() < 15.0 %} Savings are currently low. You may want to check
+                    if your source files are already efficiently encoded (HEVC/AV1) to avoid unnecessary processing. {%
                     else %} Your current settings provide a healthy balance between quality and storage efficiency. No
                     changes recommended at this time. {% endif %} </p>
         </div>
diff --git a/templates/partials/jobs_table.html b/templates/partials/jobs_table.html
index b59e6ee..3dcdfc2 100644
--- a/templates/partials/jobs_table.html
+++ b/templates/partials/jobs_table.html
@@ -1,63 +1,77 @@
-<table class="w-full text-left">
-    <thead class="text-xs text-slate-500 uppercase bg-slate-800/30">
-        <tr>
-            <th class="px-6 py-4">ID</th>
-            <th class="px-6 py-4">File & Progress</th>
-            <th class="px-6 py-4">Priority</th>
-            <th class="px-6 py-4">Status</th>
-            <th class="px-6 py-4">Actions</th>
+<table class="w-full text-left border-collapse">
+    <thead>
+        <tr class="text-xs uppercase text-slate-500 border-b border-slate-800">
+            <th class="px-6 py-4 font-medium tracking-wider">Job / Path</th>
+            <th class="px-6 py-4 font-medium tracking-wider w-32">Status</th>
+            <th class="px-6 py-4 font-medium tracking-wider w-48">Progress</th>
+            <th class="px-6 py-4 font-medium tracking-wider w-24 text-right">Actions</th>
         </tr>
     </thead>
     <tbody class="divide-y divide-slate-800/50">
         {% for job in jobs %}
-        <tr class="transition-colors group border-b border-slate-800/30">
-            <td class="px-6 py-4 font-mono text-xs text-slate-600">#{{ job.id }}</td>
+        <tr class="group hover:bg-slate-800/20 transition-colors duration-150">
             <td class="px-6 py-4">
                 <div class="font-medium truncate max-w-sm text-slate-200">{{ job.input_path }}</div>
                 <div class="text-xs text-slate-500 truncate mt-1">
-                    {% if let Some(reason) = job.decision_reason %}{{ reason }}{% endif %}
+                    {% match job.decision_reason %}
+                    {% when Some with (reason) %}{{ reason }}
+                    {% when None %}
+                    {% endmatch %}
                 </div>
 
                 {% if job.is_active() %}
-                <div class="mt-3 w-full bg-slate-800 rounded-full h-1.5 overflow-hidden">
-                    <div id="job-progress-{{ job.id }}" class="h-full transition-all duration-500 ease-out"
-                        style="width: {{ job.progress }}%; background-color: rgb(var(--brand-primary))"></div>
-                </div>
-                <div id="job-progress-text-{{ job.id }}" class="text-[10px] mt-1 font-mono uppercase tracking-wider"
-                    style="color: rgb(var(--brand-primary))">
-                    {{ job.progress_fixed() }}%
+                <div class="mt-2 text-[10px] text-slate-500 font-mono">
+                    Attempt #{{ job.attempt_count }} • Priority {{ job.priority }}
                 </div>
                 {% endif %}
             </td>
-            <td class="px-6 py-4">
-                <span class="text-xs font-mono text-slate-400">
-                    P{{ job.priority }}
-                </span>
-            </td>
             <td class="px-6 py-4">
                 <span
                     class="px-2.5 py-1 rounded-full text-[10px] font-bold border uppercase tracking-tight {{ job.status_class() }}">
                     {{ job.status }}
                 </span>
-                {% if let Some(vmaf) = job.vmaf_score %}
+            </td>
+            <td class="px-6 py-4">
+                {% match job.vmaf_score %}
+                {% when Some with (vmaf) %}
                 <span class="ml-2 px-2 py-0.5 rounded bg-slate-800 text-slate-400 text-[9px] font-mono">
                     VMAF: {{ job.vmaf_fixed() }}
                 </span>
-                {% endif %}
+                {% when None %}
+                {% endmatch %}
             </td>
             <td class="px-6 py-4">
                 <div class="flex gap-2">
+                    <div class="w-full bg-slate-800 rounded-full h-1.5 overflow-hidden">
+                        <div class="bg-indigo-500 h-1.5 rounded-full transition-all duration-500"
+                            style="width: {{ job.progress_fixed() }}%">
+                        </div>
+                    </div>
+                    <span class="text-xs font-mono text-slate-400 w-10 text-right">{{ job.progress_fixed() }}%</span>
+                </div>
+            </td>
+            <td class="px-6 py-4 text-right">
+                <div class="flex justify-end gap-2 opacity-0 group-hover:opacity-100 transition-opacity">
+                    {% if job.can_retry() %}
+                    <button hx-post="/api/jobs/{{ job.id }}/restart" hx-swap="none"
+                        class="p-1.5 hover:bg-slate-700 rounded text-slate-400 hover:text-white transition-colors"
+                        title="Retry Job">
+                        <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15">
+                            </path>
+                        </svg>
+                    </button>
+                    {% endif %}
+
                     {% if job.is_active() %}
                     <button hx-post="/api/jobs/{{ job.id }}/cancel" hx-swap="none"
-                        class="text-xs font-medium px-2 py-1 rounded transition-colors"
-                        style="color: rgb(var(--status-error));">
-                        Cancel
-                    </button>
-                    {% else %}
-                    <button hx-post="/api/jobs/{{ job.id }}/restart" hx-swap="none"
-                        class="text-xs font-medium px-2 py-1 rounded transition-colors"
-                        style="color: rgb(var(--brand-primary));">
-                        Restart
+                        class="p-1.5 hover:bg-rose-900/50 rounded text-slate-400 hover:text-rose-400 transition-colors"
+                        title="Cancel Job">
+                        <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                d="M6 18L18 6M6 6l12 12"></path>
+                        </svg>
                     </button>
                     {% endif %}
                 </div>