merge for develp
moved toggle into own class