Started to implemente wearable application. Required some refactoring