-Bug Fixes.  Near finished.  Needs Testing.