Recommit BuddyLess. It's still in active development and submodules are not ideal