Organized the hex class better and finished goldcollect phase