lots of reorganization, streamlining, and refactoring. many things still not working properly.