Refactored previous project into this
Refactored previous project into this