add basic functionality from WIHIS. Need to refactor and clean code.