Final Commit to start non-wpf interface