almost done with m7
done m8
Added javadocs to EVERYTHING

Yes, even useless methods
Loading and Saving

Still needs a bit of fixing though
So many merge fixes