WIP for sliverlight changes