Updated package name (Java didn't like the old one) and added more
code..