Added remote functionality
added a todo