Javadoc
INSANE javadoc
Moved to correct package
Updated for exception moving