v2.0 - Moved all Model /  ViewModel code to PCL