Mostly done with EJB stuff. Uploading changes.