merged tipp codebase