Added javadoc, strategies in progress