Add some arrows, migrate to stack/builder package