Initial import for the buddy version. It's based on the list version and will evolve from there