Refactor and start on remote support