v1 of checking in
Fixing merge conflicts