Added collectable items and placeholder positions
Attemping to fix merges.