Committing before I make major changes to .java files and xml files