Migrated all major changes from minimal. Passed 100+ test cases for FSCI