I added enter squre logic and fixed some things. I have to fix service client logic and registration id logic.
Merged rfrost.