Missed a refactor :P  Also, javadoc event