need to get functionality done first

stopped refactoring and started work on functionalities