Refactor in code
Fully functional
Ready to integrate with UI