Revise class structure to accomodate more than just prajurit's location