started refactoring
removed occ stuff