Add a bean keeper
Rename
TODO