lots of partial little changes. nothing working yet w/ EJB