Cleaned code and added more Tasks.
Service structure and testing ui