Refactored. Converted to Maven, Organized, Updated.
Shrank on join. I'ts almost spam if we did it the previous way