Big core changes, added primitive selector.