Adding class headers + some javadoc