ditched bean @ManyToOne associations, need to go through and fix all names