Initial merge with original repo