rethink on bean/controller design - big changes