Data types adjusted and refactored for the most part -- some work still needs to be done.
some resurrection prototype