Final Commit (Sort of)

As good as it's going to get for the time being.