J fix v2

All the versions work and I was able to do most of the clean up