Patch 9.99 - Final Commit (Hopefully)