Move to CustomItems

Should've committed this before, probably.