Moving control section features to new function interface