remove methods from helper, put them in own class
remove methods from helper, put them in own class