Adding in dynamic controls