Finish core logic - No goal reach logic yet