Added second implimentation (Using Standard Java), refactored testing, regenerated javadoc