-near finished.  Needs Testing
-bug fixes.  Near finished.  Needs Testing.