Completed a few final touches. This should work, mostly.