Refactor
Progress on SFT
More progress on refactoring