Basically finished. Requires a little more testing and tuning up.