Starting documenting these classes (rep inv. thread safety arg..)
fixed merge conflicts