merge simulation refactor
simplified md functions in simulate
created ripit and pullit instead of puff