Begin to revamp base controller