Service/Activity code mostly finished