added TODO for possibly using Javadoc tags in the future