WIP for more silverlight changes