Added some changes to Bishop and other classes, need to update my eclipse environment before continuing