Updates on mobility and moving from dropbox
Fix merge issues