Base change again

also updated to take full advantage of controllers