about to make some changes
finished changes, refactorings and unit tests coming