Kyle and Mehmet's contributions

Sent as a PR because I'm not sure if we have violated the design of beans or not.