Almost done

Now working on the core set.