RFC #1: Add core