Implemented the 4 fitness functions and made some changes to the infrastructure