diff --git a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
index 2b06546..0566fbd 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java
@@ -9,8 +9,7 @@
     private String uid = null;
     private String password=null;
     private String name = null;
-    private String latitude=null;
-    private String longitude=null;
+    private Location location;
     
     public void setUid(String uid) {
         SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
@@ -71,46 +70,15 @@
         return token;
     }
 
-//    public void setLatitude(String latitude) {
-//        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-//        SharedPreferences.Editor editor = prefData.edit();
-//        editor.putString("latitude", latitude);
-//        editor.commit();
-//    }
-//    public String getLatitude() {
-//        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-//        latitude = prefData.getString("latitude","");
-//        return latitude;
-//    }
-//
-//    public void setLongitude(String longitude) {
-//        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-//        SharedPreferences.Editor editor = prefData.edit();
-//        editor.putString("longitude", longitude);
-//        editor.commit();
-//    }
-//
-//    public String getLongitude() {
-//        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-//        longitude = prefData.getString("longitude","" );
-//        return longitude;
-//    }
+    public void setLocation(Location loc){
+        location=loc;
+    }
 
-//    public void setLocation(Location latitude,Location longitude){
-//        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-//        SharedPreferences.Editor editor = prefData.edit();
-//        editor.putString("latitude", latitude);
-//        editor.putFloat("longitude", longitude);
-//        editor.commit();
-//    }
+    public Location getLocation(){
+        return location;
+    }
 
-//    public void getLocation(){
-//        SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE);
-//        longitude = prefData.getString("longitude","" );
-//        return longitude;
-//    }
-
-    public void getPlayListManager(){
+    public void getBackgroundService(){
 
     }