#7, #11: Finished the discipline adding and added Java docs