Refactored and started implementing Mine