Update local branch with jorges work
Continue to Update Main App to work with service