Character Bean Development

Pulling in changes from BeanDevelopment branch into master.