working towards existing code refactored as paas class
more refactoring
refactoring