removed merge file
more docs
whitespace
brought back history
Added history object back to stateful.