Add accessibility and create main for thing that have no obvious place to reside