first commit to get this tested
fixed merge conflicts