Work through some issues with the base setup controller