More Javadocs.. It's been a while.