Added helpers and tabletop working