More collectables

Now there are two types of collectables.