Revised code and startdto reorganize. Helper classes more flexible