- Refactored some code and testing on new framerwork and VS version.