Create JavaDocs and New tests (incomplete)