Intermediate commit, working on updating features, objects and their tabs.