Extracted states to external classes
Fixed Bid class. updated minor things
minor updates