Finish porting windowsphone