Bat tap

Not ready to merge yet.