Merged
STATES!!!!! And proper board updating!