Adam - Fixing merge issues

I think I got all the merge issues resolved - time to test!