State Machine updated and basic score functionality
Merge conflicts resolved