add helper method and put everything in one file
working tests and methods