initial commit from patrick bader