More work on controllers and libraries